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

Merge branch '3.8'

Browse Source
This commit is contained in:
Romain Neutron
2013-09-19 14:53:55 +02:00
parent 45c5276923 b7d93e780d
commit 0b9c8b64ac
12 changed files with 1952 additions and 1749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/classes/module/report/dashboard/feed.php
View File

@@ -72,7 +72,10 @@ class module_report_dashboard_feed implements module_report_dashboard_componentI
$cache_id = 'feed_' . md5($sbasid . '_' . $sbas_coll . '_' . $dmin . '_' . $dmax);
try {
return $app['phraseanet.appbox']->get_data_from_cache($cache_id);
$result = $app['phraseanet.appbox']->get_data_from_cache($cache_id);
$result->setApplication($app);
return $result;
} catch (Exception $e) {
}
@@ -231,4 +234,21 @@ class module_report_dashboard_feed implements module_report_dashboard_componentI
return false;
}
}
private function setApplication(Application $app)
{
$this->app = $app;
}
public function __sleep()
{
$vars = array();
foreach ($this as $key => $value) {
if (in_array($key, array('app')))
continue;
$vars[] = $key;
}
return $vars;
}
}