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

2
lib/classes/deprecated/inscript.api.php
View File

@@ -112,7 +112,7 @@ function giveMeBases(Application $app, $usr = null)
$collInscript = $baseInscript;
$defined = false;
$cguSpec = false;
if ($xml = simplexml_load_string($collection->get_prefs())) {
if (false !== $xml = simplexml_load_string($collection->get_prefs())) {
$defined = true;
foreach ($xml->xpath('/baseprefs/caninscript') as $caninscript) {
$tmp = (string) $caninscript;