mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-28 18:30:53 +02:00
Code Issues Releases Wiki Activity

Clear libxml errors in toRSS test. Forum shortcode fix.

Browse Source
This commit is contained in:
Cameron
2021-01-07 09:47:30 -08:00
parent 3d19db894b
commit a908ce82b6
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
View File

@@ -154,7 +154,7 @@ class forum_shortcodes extends e_shortcode
// To be reworked to get the $forum var // To be reworked to get the $forum var
$trackPref = varset($this->prefs['track']); $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] = "<a href='".e107::url('forum','track')."'>".LAN_FORUM_0030."</a>"; $uInfo[2] = "<a href='".e107::url('forum','track')."'>".LAN_FORUM_0030."</a>";
} }

7
e107_tests/tests/unit/e_parseTest.php
View File

@@ -539,11 +539,11 @@ while(&#036;row = &#036;sql-&gt;fetch())
*/ */
public function testToRss() public function testToRss()
{ {
if(PHP_VERSION_ID < 71000 ) /* if(PHP_VERSION_ID < 71000 )
{ {
$this->markTestSkipped("testToRSS() skipped. Requires a healthy libxml installation"); $this->markTestSkipped("testToRSS() skipped. Requires a healthy libxml installation");
return null; return null;
} }*/
$tests = array( $tests = array(
'[html]<pre class=&quot;prettyprint linenums&quot; style=&quot;unicode-bidi: embed; direction: ltr;&quot;>&lt;/p&gt;&lt;p&gt;&lt;core name=&quot;e_jslib_plugin&quot;&gt;&lt;![CDATA[Array]]&gt;&lt;/core&gt;&lt;/p&gt;&lt;p&gt;&lt;core name=&quot;e_jslib_theme&quot;&gt;&lt;![CDATA[Array]]&gt;&lt;/core&gt;</pre>[/html]', '[html]<pre class=&quot;prettyprint linenums&quot; style=&quot;unicode-bidi: embed; direction: ltr;&quot;>&lt;/p&gt;&lt;p&gt;&lt;core name=&quot;e_jslib_plugin&quot;&gt;&lt;![CDATA[Array]]&gt;&lt;/core&gt;&lt;/p&gt;&lt;p&gt;&lt;core name=&quot;e_jslib_theme&quot;&gt;&lt;![CDATA[Array]]&gt;&lt;/core&gt;</pre>[/html]',
@@ -571,6 +571,7 @@ while(&#036;row = &#036;sql-&gt;fetch())
$xmlContent = '<?xml version="1.0" encoding="utf-8"?>'."\n".'<description>'.$xmlContent.'</description>'; $xmlContent = '<?xml version="1.0" encoding="utf-8"?>'."\n".'<description>'.$xmlContent.'</description>';
libxml_use_internal_errors(true); libxml_use_internal_errors(true);
libxml_clear_errors();
$doc = new DOMDocument('1.0', 'utf-8'); $doc = new DOMDocument('1.0', 'utf-8');
$doc->loadXML($xmlContent); $doc->loadXML($xmlContent);
@@ -579,7 +580,7 @@ while(&#036;row = &#036;sql-&gt;fetch())
if(!empty($errors)) if(!empty($errors))
{ {
var_dump($errors); codecept_debug($errors);
} }
libxml_clear_errors(); libxml_clear_errors();