From 721a696acbbdd5de5c8ddcac42f2f78af7ec36df Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 15 Jan 2017 09:28:20 -0800 Subject: [PATCH] Forum: Backward compatibility fixes. --- e107_core/shortcodes/single/email_item.sc | 4 ++-- e107_core/shortcodes/single/print_item.sc | 4 ++-- e107_plugins/forum/forum_viewtopic.php | 2 +- e107_plugins/forum/templates/forum_icons_template.php | 2 +- e107_plugins/forum/templates/forum_template.php | 2 +- e107_plugins/forum/templates/forum_viewforum_template.php | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/e107_core/shortcodes/single/email_item.sc b/e107_core/shortcodes/single/email_item.sc index ed82b8f13..71226d57d 100644 --- a/e107_core/shortcodes/single/email_item.sc +++ b/e107_core/shortcodes/single/email_item.sc @@ -15,12 +15,12 @@ if(deftrue('BOOTSTRAP')) elseif (defined("ICONMAIL") && file_exists(THEME."images/".ICONMAIL)) { $icon = THEME_ABS."images/".ICONMAIL; - $img = "{$parms[0]}"; + $img = "{$parms[0]}"; } else { $icon = e_IMAGE_ABS."generic/email.png"; - $img = "{$parms[0]}"; + $img = "{$parms[0]}"; } // message^source^other_parms diff --git a/e107_core/shortcodes/single/print_item.sc b/e107_core/shortcodes/single/print_item.sc index 80f03ad6b..de2ea7697 100644 --- a/e107_core/shortcodes/single/print_item.sc +++ b/e107_core/shortcodes/single/print_item.sc @@ -10,12 +10,12 @@ if(deftrue('BOOTSTRAP')) elseif (defined("ICONPRINT") && file_exists(THEME."images/".ICONPRINT)) { $icon = THEME_ABS."images/".ICONPRINT; - $img = "{$parms[0]}"; + $img = "{$parms[0]}"; } else { $icon = e_IMAGE_ABS."generic/printer.png"; - $img = "{$parms[0]}"; + $img = "{$parms[0]}"; } diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php index 06d9beca6..05ca2f9c8 100644 --- a/e107_plugins/forum/forum_viewtopic.php +++ b/e107_plugins/forum/forum_viewtopic.php @@ -606,7 +606,7 @@ if ($thread->threadInfo['thread_lastpost'] > USERLV && !in_array($thread->thread else { $ret = array('lastpost'=>$thread->threadInfo['thread_lastpost'], 'lastvisit'=>USERLV, 'thread'=>$thread->threadId, 'viewed'=>$threadsViewed); - $mes->addDebug(print_a($ret,true)); + e107::getDebug()->log($ret); unset($ret); } diff --git a/e107_plugins/forum/templates/forum_icons_template.php b/e107_plugins/forum/templates/forum_icons_template.php index e0d4d5769..3033e7fcd 100644 --- a/e107_plugins/forum/templates/forum_icons_template.php +++ b/e107_plugins/forum/templates/forum_icons_template.php @@ -65,7 +65,7 @@ define('IMAGE_untrack', ''.LAN_FORU // User info define('IMAGE_website', '<img src='); -define('IMAGE_email', ''.LAN_FORUM_2044.''); +define('IMAGE_email', ''.LAN_FORUM_2044.''); define('IMAGE_profile', ''.LAN_FORUM_4007.''); // action diff --git a/e107_plugins/forum/templates/forum_template.php b/e107_plugins/forum/templates/forum_template.php index 33661636f..67f9e6b47 100644 --- a/e107_plugins/forum/templates/forum_template.php +++ b/e107_plugins/forum/templates/forum_template.php @@ -27,7 +27,7 @@ if (!isset($FORUM_MAIN_FORUM)) { $SC_WRAPPER['LASTPOST:type=date'] = "{---}
"; $SC_WRAPPER['LASTPOST:type=url'] = " ".IMAGE_post2.""; - $FORUM_MAIN_FORUM = "\n{NEWFLAG}\n{FORUMNAME}
{FORUMDESCRIPTION}{FORUMSUBFORUMS}\n{THREADS}\n{REPLIES}\n{LASTPOST:type=date}{LASTPOSTUSER}{LASTPOST:type=url}\n"; + $FORUM_MAIN_FORUM = "\n{NEWFLAG}\n{FORUMNAME}
{FORUMDESCRIPTION}{FORUMSUBFORUMS}\n{THREADS}\n{REPLIES}\n{LASTPOST}\n"; } if (!isset($FORUM_MAIN_END)) { diff --git a/e107_plugins/forum/templates/forum_viewforum_template.php b/e107_plugins/forum/templates/forum_viewforum_template.php index 51485e21e..a5f7cfae7 100644 --- a/e107_plugins/forum/templates/forum_viewforum_template.php +++ b/e107_plugins/forum/templates/forum_viewforum_template.php @@ -70,7 +70,7 @@ if(empty($FORUM_VIEW_START_CONTAINER)) "; } - +// XXX These templates should remain unchanged. if (empty($FORUM_VIEW_FORUM)) { $SC_WRAPPER['LASTPOST:type=date'] = "{---}
"; $SC_WRAPPER['LASTPOST:type=url'] = " ".IMAGE_post2.""; @@ -91,7 +91,7 @@ if (empty($FORUM_VIEW_FORUM)) { {POSTER}
{THREADDATE} {REPLIES} {VIEWS} - {LASTPOST:type=date}{LASTPOSTUSER}{LASTPOST:type=url} + {LASTPOST} "; }