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:
	CHANGELOG.md
	bin/developer
	lib/classes/module/console/systemUpgrade.php
	www/skins/report/jquery-ui.css
This commit is contained in:
Romain Neutron
2013-10-03 15:29:22 +02:00
parent 642a1a5657 0a86cb635e
commit 1dfbff5666
82 changed files with 2558 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -496,7 +496,7 @@ class databox_field implements cache_cacheableInterface
throw new InvalidArgumentException(sprintf('Code %s is not defined', $code));
}
return isset($this->labels[$code]) ? $this->labels[$code] : $this->name;
return isset($this->labels[$code]) && '' !== $this->labels[$code] ? $this->labels[$code] : $this->name;
}
/**