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." - "; + ".$key." + "; $text .= !empty($val['class']) ? $val['class']."->" : ''; $text .= !empty($val['include_filename']) ? "include: ". str_replace($this->docroot,'', $val['include_filename']) : ''; $text .= !empty($val['function']) ? $val['function']."(" : ""; $text .= !empty($val['params']) ? print_r($val['params'],true) : ''; $text .= !empty($val['function']) ? ")" : ""; $text .=" - "; + "; $text .= str_replace($this->docroot,'', $val['file']).":".$val['line']; $text .= " "; @@ -2480,7 +2480,7 @@ class error_handler { foreach ($this->errors as $key => $value) { - $ret .= "{$value['short']}\n"; + $ret .= "{$value['short']}\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 = '