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

Merge remote-tracking branch 'upstream/master' into elastic-indexer

Browse Source 
Conflicts:
	composer.lock
	www/scripts/apps/admin/main/app.js
This commit is contained in:
Mathieu Darse
2015-03-10 15:25:20 +01:00
parent 38224cfae1 42a21e8e7d
commit 63eaaf1596
92 changed files with 27708 additions and 28968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1009,12 +1009,12 @@ class databox_field implements cache_cacheableInterface
}
$sql = "INSERT INTO metadatas_structure
(`id`, `name`, `src`, `readonly`, `indexable`, `type`, `tbranch`,
(`id`, `name`, `src`, `readonly`, `required`, `indexable`, `type`, `tbranch`,
`thumbtitle`, `multi`, `business`, `aggregable`,
`report`, `sorter`)
VALUES (null, :name, '', 0, 1, 'string', '',
`report`, `sorter`, `separator`)
VALUES (null, :name, '', 0, 0, 1, 'string', '',
null, :multi,
0, 0, 1, :sorter)";
0, 0, 1, :sorter, '')";
$name = self::generateName($name);