1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-11 17:14:42 +02:00

Blogger Import added. TinyMce Image fixes. Custom-pages fixes. Moved Upload-js out of admin header and into media-manager page only. Parser fixes for [html] bbcode. XML parser fix for <content:encoded> rss tags.

This commit is contained in:
CaMer0n
2012-07-23 02:25:17 +00:00
parent 384b123475
commit d5a3b29340
18 changed files with 475 additions and 133 deletions

View File

@@ -367,6 +367,9 @@ class xmlClass
{
return FALSE;
}
$xmlData = str_replace('content:encoded', 'content_encoded', $xmlData);
if(!$xml = simplexml_load_string($xmlData))
{
$this->errors = $this->getErrors($xmlData);
@@ -388,9 +391,12 @@ class xmlClass
*/
function xml2array($xml, $rec_parent = '')
{
$ret = array();
$tags = get_object_vars($xml);
//remove comments
if($this->stripComments && isset($tags['comment']))
{
@@ -465,6 +471,7 @@ class xmlClass
//more cases?
default:
$count = count($xml->{$tag});
if($count >= 1) //array of elements - loop
{
@@ -596,7 +603,7 @@ class xmlClass
$vars[$vl] = array($vars[$vl]);
}
}
return $vars;
}