hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +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

6
lib/classes/queries.class.php
View File

@@ -35,8 +35,8 @@ class queries
}
$cssTopics = '';
if ($xmlTopics && ($sxTopics = simplexml_load_file($xmlTopics))) {
$cssTopics = (string) ($sxTopics->display->css);
if ($xmlTopics && false !== $sxTopics = simplexml_load_file($xmlTopics)) {
$cssTopics = (string) $sxTopics->display->css;
}
$out .= '<style type="text/css">
@@ -96,7 +96,7 @@ class queries
$jsTopics = 'null';
$maxdepth = 0;
if (($sxTopics = simplexml_load_file($xmlTopics))) {
if (false !== $sxTopics = simplexml_load_file($xmlTopics)) {
$jsTopics = self::topicsAsJS($sxTopics->topics, 0, $maxdepth);
}