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

Fix merge 3.8

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-12-09 14:01:00 +01:00
parent 9f38823f27
commit 589169299c
29 changed files with 430 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/classes/databox.php
View File

@@ -705,15 +705,8 @@ class databox extends base
$this->meta_struct = new databox_descriptionStructure();
<<<<<<< HEAD
if ($metaStructData) {
foreach ($metaStructData as $row) {
$this->meta_struct->add_element(databox_field::get_instance($this->app, $this, $row['id']));
}
=======
foreach ((array) $metaStructData as $row) {
$this->meta_struct->add_element(databox_field::get_instance($this->app, $this, $row['id']));
>>>>>>> 3.8
}
return $this->meta_struct;