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

Merge branch '3.8'

Browse Source 
Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/classes/caption/field.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/download.php
	lib/classes/task/period/apibridge.php
This commit is contained in:
Nicolas Le Goff
2014-12-16 13:07:25 +01:00
parent 088b0672cb 9554f063c6
commit 5e33fdafe4
12 changed files with 125 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -422,7 +422,7 @@ class databox_field implements cache_cacheableInterface
$stmt->closeCursor();
if ($this->renamed) {
caption_field::rename_all_metadatas($this);
caption_field::rename_all_metadatas($this->app, $this);
$this->renamed = false;
}