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

Fix tests

Browse Source
This commit is contained in:
Romain Neutron
2012-11-12 19:29:48 +01:00
parent 403a5e0cac
commit c4936399c6
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Alchemy/Phrasea/Controller/Admin/Users.php
View File

@@ -98,7 +98,7 @@ class Users implements ControllerProviderInterface
$rights = new UserHelper\Edit($app, $app['request']); $rights = new UserHelper\Edit($app, $app['request']);
$rights->apply_quotas(); $rights->apply_quotas();
return; return $app->json(array('message' => '', 'error' => false));
}); });
$controllers->post('/rights/time/', function(Application $app) { $controllers->post('/rights/time/', function(Application $app) {
@@ -111,7 +111,7 @@ class Users implements ControllerProviderInterface
$rights = new UserHelper\Edit($app, $app['request']); $rights = new UserHelper\Edit($app, $app['request']);
$rights->apply_time(); $rights->apply_time();
return; return $app->json(array('message' => '', 'error' => false));
}); });
$controllers->post('/rights/masks/', function(Application $app) { $controllers->post('/rights/masks/', function(Application $app) {
@@ -124,7 +124,7 @@ class Users implements ControllerProviderInterface
$rights = new UserHelper\Edit($app, $app['request']); $rights = new UserHelper\Edit($app, $app['request']);
$rights->apply_masks(); $rights->apply_masks();
return; return $app->json(array('message' => '', 'error' => false));
}); });
$controllers->match('/search/', function(Application $app) { $controllers->match('/search/', function(Application $app) {

2
lib/Alchemy/Phrasea/Controller/Prod/Edit.php
View File

@@ -302,7 +302,7 @@ class Edit implements ControllerProviderInterface
} }
if (!is_array($request->request->get('mds'))) { if (!is_array($request->request->get('mds'))) {
return; return $app->json(array('message' => '', 'error' => false));
} }
$databoxes = $records->databoxes(); $databoxes = $records->databoxes();

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

@@ -965,10 +965,14 @@ class databox extends base
$thesaurus = $this->get_thesaurus(); $thesaurus = $this->get_thesaurus();
if ($thesaurus && ($tmp = DomDocument::loadXML($thesaurus)) !== false) $dom = new DOMDocument();
if ($thesaurus && false !== $tmp = $dom->loadXML($thesaurus)) {
self::$_dom_thesaurus[$sbas_id] = $tmp; self::$_dom_thesaurus[$sbas_id] = $tmp;
else } else {
self::$_dom_thesaurus[$sbas_id] = false; self::$_dom_thesaurus[$sbas_id] = false;
unset($dom);
}
return self::$_dom_thesaurus[$sbas_id]; return self::$_dom_thesaurus[$sbas_id];
} }