mirror of
https://github.com/e107inc/e107.git
synced 2025-08-06 06:38:00 +02:00
Fix for xml class url conflicts.
This commit is contained in:
@@ -768,6 +768,7 @@ class xmlClass
|
|||||||
if (strpos($fname, '://') !== false)
|
if (strpos($fname, '://') !== false)
|
||||||
{
|
{
|
||||||
$this->getRemoteFile($fname);
|
$this->getRemoteFile($fname);
|
||||||
|
$this->_feedUrl = false; // clear it to avoid conflicts.
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -778,6 +779,8 @@ class xmlClass
|
|||||||
}
|
}
|
||||||
if ($this->xmlFileContents)
|
if ($this->xmlFileContents)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
if ($replace_constants == true)
|
if ($replace_constants == true)
|
||||||
{
|
{
|
||||||
$this->xmlFileContents = $tp->replaceConstants($this->xmlFileContents, '', true);
|
$this->xmlFileContents = $tp->replaceConstants($this->xmlFileContents, '', true);
|
||||||
|
Reference in New Issue
Block a user