hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with 3.7

Browse Source
This commit is contained in:
Romain Neutron
2012-11-07 16:16:13 +01:00
parent d25bae42a7 599f29ec0f
commit 527b68e0f5
28 changed files with 540 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/databox.class.php
View File

@@ -1009,7 +1009,7 @@ class databox extends base
$thesaurus = $this->get_thesaurus();
if ($thesaurus && ($tmp = simplexml_load_string($thesaurus)) !== false)
if ($thesaurus && false !== $tmp = simplexml_load_string($thesaurus))
self::$_sxml_thesaurus[$sbas_id] = $tmp;
else
self::$_sxml_thesaurus[$sbas_id] = false;
@@ -1174,7 +1174,7 @@ class databox extends base
$structure = $this->get_structure();
if ($structure && ($tmp = simplexml_load_string($structure)) !== false)
if ($structure && false !== $tmp = simplexml_load_string($structure))
$this->_sxml_structure = $tmp;
else
$this->_sxml_structure = false;