From 5d9948e39c4add6c16d81699d91433d3805f2db9 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 18 May 2010 17:27:21 +0200 Subject: [PATCH] [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" When quoting from the topic-review the statement "Author wrote:" is missing. The fix for this was not complete: Now it's backwards compatibile and uses the LA_ for the language variables. PHPBB3-9531 --- phpBB/styles/prosilver/template/editor.js | 6 ++++++ phpBB/styles/prosilver/template/posting_topic_review.html | 2 +- phpBB/styles/prosilver/template/ucp_pm_history.html | 2 +- phpBB/styles/subsilver2/template/editor.js | 6 ++++++ phpBB/styles/subsilver2/template/posting_topic_review.html | 2 +- phpBB/styles/subsilver2/template/ucp_pm_history.html | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js index c4c3483766..ddc862bb8c 100644 --- a/phpBB/styles/prosilver/template/editor.js +++ b/phpBB/styles/prosilver/template/editor.js @@ -200,6 +200,12 @@ function addquote(post_id, username, l_wrote) var theSelection = ''; var divarea = false; + if (l_wrote === undefined) + { + // Backwards compatibility + l_wrote = 'wrote'; + } + if (document.all) { divarea = document.all[message_name]; diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html index 879e6bb7fc..a05f057e21 100644 --- a/phpBB/styles/prosilver/template/posting_topic_review.html +++ b/phpBB/styles/prosilver/template/posting_topic_review.html @@ -24,7 +24,7 @@
{L_POST_DETAILS}
diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html index 32b8072082..c555e90640 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_history.html +++ b/phpBB/styles/prosilver/template/ucp_pm_history.html @@ -17,7 +17,7 @@
diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js index 54bd3450d0..e340bc74b5 100644 --- a/phpBB/styles/subsilver2/template/editor.js +++ b/phpBB/styles/subsilver2/template/editor.js @@ -202,6 +202,12 @@ function addquote(post_id, username, l_wrote) var theSelection = ''; var divarea = false; + if (l_wrote === undefined) + { + // Backwards compatibility + l_wrote = 'wrote'; + } + if (document.all) { divarea = document.all[message_name]; diff --git a/phpBB/styles/subsilver2/template/posting_topic_review.html b/phpBB/styles/subsilver2/template/posting_topic_review.html index 5456ad09b6..54bbf6e553 100644 --- a/phpBB/styles/subsilver2/template/posting_topic_review.html +++ b/phpBB/styles/subsilver2/template/posting_topic_review.html @@ -36,7 +36,7 @@   {L_POST_SUBJECT}:  {topic_review_row.POST_SUBJECT} -  {QUOTE_IMG} +  {QUOTE_IMG} diff --git a/phpBB/styles/subsilver2/template/ucp_pm_history.html b/phpBB/styles/subsilver2/template/ucp_pm_history.html index d11822cc39..53391b30c9 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_history.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_history.html @@ -59,7 +59,7 @@ {L_VIEW_PM} -
 {PROFILE_IMG} {EMAIL_IMG}  
href="{history_row.U_QUOTE}"href="#" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{L_WROTE}'); return false;">{QUOTE_IMG} {REPLY_IMG} 
+
 {PROFILE_IMG} {EMAIL_IMG}  
href="{history_row.U_QUOTE}"href="#" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}'); return false;">{QUOTE_IMG} {REPLY_IMG}