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

Introduce configuration-tester

Browse Source
This commit is contained in:
Romain Neutron
2013-04-17 21:19:55 +02:00
parent 1b82dfb1da
commit 5a80e9dc22
36 changed files with 1810 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/User/Adapter.php
View File

@@ -362,7 +362,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
if (!isset(self::$_instance[$id])) {
try {
self::$_instance[$id] = $app['phraseanet.appbox']->get_data_from_cache('_user_' . $id);
self::$_instance[$id]->set_app($app['phraseanet.appbox']);
self::$_instance[$id]->set_app($app);
} catch (Exception $e) {
self::$_instance[$id] = new self($id, $app);
$app['phraseanet.appbox']->set_data_to_cache(self::$_instance[$id], '_user_' . $id);
@@ -1727,7 +1727,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
{
$vars = array();
foreach ($this as $key => $value) {
if (in_array($key, array('ACL', 'appbox')))
if (in_array($key, array('ACL', 'app')))
continue;
$vars[] = $key;
}