diff --git a/class2.php b/class2.php
index ba70c72c8..5ddacd8cb 100644
--- a/class2.php
+++ b/class2.php
@@ -2434,15 +2434,15 @@ class error_handler
{
$text .= "
- ".$key." |
- ";
+ |
+
- ";
+ |
";
@@ -2480,7 +2480,7 @@ class error_handler
{
foreach ($this->errors as $key => $value)
{
- $ret .= "\n";
+ $ret .= "
\n";
}
}
diff --git a/e107_core/bbcodes/bb_img.php b/e107_core/bbcodes/bb_img.php
index 26568ea24..1a603fbc4 100644
--- a/e107_core/bbcodes/bb_img.php
+++ b/e107_core/bbcodes/bb_img.php
@@ -48,7 +48,7 @@ class bb_img extends e_bb_base
$figcaption = false;
- if($imgParms['figcaption'])
+ if(!empty($imgParms['figcaption']))
{
$figcaption = $imgParms['figcaption'];
unset($imgParms['figcaption']);
diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index fb02909cb..21fa34faf 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -816,6 +816,10 @@ class admin_shortcodes
$parsed = file_get_contents($file);
$tmp = e107::unserialize($parsed);
+ if(!defined('e_MULTISITE_MATCH'))
+ {
+ define('e_MULTISITE_MATCH', null);
+ }
// e107::getDebug()->log($tmp);
$text = '
diff --git a/e107_handlers/db_debug_class.php b/e107_handlers/db_debug_class.php
index 79c3875b3..9730f7bbe 100644
--- a/e107_handlers/db_debug_class.php
+++ b/e107_handlers/db_debug_class.php
@@ -870,10 +870,10 @@ class e107_db_debug {
if (!$bRowHeaders)
{
$bRowHeaders = true;
- $text .= "".implode(" | ", array_keys($curLog))." |
\n";
+ $text .= "".implode(" | ", array_keys($curLog))." |
\n";
}
- $text .= "\n";
+ $text .= "
\n";
}
$text .= "
\n";
diff --git a/e107_plugins/forum/languages/English/English_front.php b/e107_plugins/forum/languages/English/English_front.php
index 8e0247810..8455ecb7c 100644
--- a/e107_plugins/forum/languages/English/English_front.php
+++ b/e107_plugins/forum/languages/English/English_front.php
@@ -21,7 +21,7 @@ vf, vt, etc. in the comments refer to the LAN defined in the previously separate
vf = viewforum, vt = viewtopic, p = post, etc.
*/
-define("e_PAGETITLE", "Forum");
+// define("e_PAGETITLE", "Forum");
// forum.php (forum_template)
// define("LAN_FORUM_0001", "Forum"); // LAN_46
diff --git a/e107_plugins/page/e_related.php b/e107_plugins/page/e_related.php
index 69491c174..2fc920faa 100644
--- a/e107_plugins/page/e_related.php
+++ b/e107_plugins/page/e_related.php
@@ -72,7 +72,7 @@ class page_related // replace 'e_' with 'plugin-folder_'
$items[] = array(
'title' => $title,
'url' => e107::getUrl()->create('page/view/index',$row), // '{e_BASE}news.php?extend.'.$row['news_id'],
- 'summary' => $row['page_metadescr'],
+ 'summary' => $row['page_metadscr'],
'image' => $row['menu_image']
);
}