diff --git a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php index 1c35a7c99..8b33de5e7 100644 --- a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php @@ -154,7 +154,7 @@ class forum_shortcodes extends e_shortcode // To be reworked to get the $forum var $trackPref = varset($this->prefs['track']); - if(!empty($trackPref) && $forum->checkPerm($this->var['forum_id'], 'post')) + if(!empty($trackPref) && is_object($forum) && $forum->checkPerm($this->var['forum_id'], 'post')) { $uInfo[2] = "".LAN_FORUM_0030.""; } diff --git a/e107_tests/tests/unit/e_parseTest.php b/e107_tests/tests/unit/e_parseTest.php index 2175a190d..8f69a4cbc 100644 --- a/e107_tests/tests/unit/e_parseTest.php +++ b/e107_tests/tests/unit/e_parseTest.php @@ -539,11 +539,11 @@ while($row = $sql->fetch()) */ public function testToRss() { - if(PHP_VERSION_ID < 71000 ) + /* if(PHP_VERSION_ID < 71000 ) { $this->markTestSkipped("testToRSS() skipped. Requires a healthy libxml installation"); return null; - } + }*/ $tests = array( '[html]
</p><p><core name="e_jslib_plugin"><![CDATA[Array]]></core></p><p><core name="e_jslib_theme"><![CDATA[Array]]></core>[/html]', @@ -571,6 +571,7 @@ while($row = $sql->fetch()) $xmlContent = ''."\n".'