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

Fix #1491 : Fix cache serialization in case of controlled vocabulary

Browse Source
This commit is contained in:
Romain Neutron
2013-09-27 19:06:40 +02:00
parent be02d1d7a0
commit d4c2e5959e
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/classes/databox/field.php
View File

@@ -141,6 +141,7 @@ class databox_field implements cache_cacheableInterface
protected static $_instance = array(); protected static $_instance = array();
protected $dces_element; protected $dces_element;
protected $Vocabulary; protected $Vocabulary;
protected $VocabularyType;
protected $VocabularyRestriction = false; protected $VocabularyRestriction = false;
protected $on_error = false; protected $on_error = false;
protected $original_src; protected $original_src;
@@ -222,13 +223,8 @@ class databox_field implements cache_cacheableInterface
$this->position = (Int) $row['sorter']; $this->position = (Int) $row['sorter'];
$this->type = $row['type'] ? : self::TYPE_STRING; $this->type = $row['type'] ? : self::TYPE_STRING;
$this->tbranch = $row['tbranch']; $this->tbranch = $row['tbranch'];
$this->VocabularyType = $row['VocabularyControlType'];
try {
$this->Vocabulary = Vocabulary\Controller::get($this->app, $row['VocabularyControlType']);
$this->VocabularyRestriction = !!$row['RestrictToVocabularyControl']; $this->VocabularyRestriction = !!$row['RestrictToVocabularyControl'];
} catch (\InvalidArgumentException $e) {
}
if ($row['dces_element']) { if ($row['dces_element']) {
$dc_class = 'databox_Field_DCES_' . $row['dces_element']; $dc_class = 'databox_Field_DCES_' . $row['dces_element'];
@@ -297,6 +293,7 @@ class databox_field implements cache_cacheableInterface
{ {
$this->app = $app; $this->app = $app;
$this->set_databox($this->app['phraseanet.appbox']->get_databox($this->sbas_id)); $this->set_databox($this->app['phraseanet.appbox']->get_databox($this->sbas_id));
$this->loadVocabulary();
} }
/** /**
@@ -1016,7 +1013,7 @@ class databox_field implements cache_cacheableInterface
{ {
$vars = array(); $vars = array();
foreach ($this as $key => $value) { foreach ($this as $key => $value) {
if (in_array($key, array('databox', 'app'))) if (in_array($key, array('databox', 'app', 'Vocabulary')))
continue; continue;
$vars[] = $key; $vars[] = $key;
} }
@@ -1069,4 +1066,13 @@ class databox_field implements cache_cacheableInterface
{ {
return $this->databox->delete_data_from_cache($this->get_cache_key($option)); return $this->databox->delete_data_from_cache($this->get_cache_key($option));
} }
private function loadVocabulary()
{
try {
$this->Vocabulary = Vocabulary\Controller::get($this->app, $this->VocabularyType);
} catch (\InvalidArgumentException $e) {
}
}
} }