merge r12725 from branch 2.3 to trunk

feature 2533 added: ability to deactivate uniqueness check on pwg.images.add


git-svn-id: http://piwigo.org/svn/trunk@12726 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2011-12-13 14:42:54 +00:00
parent 4bc17c2e40
commit 5338ef80ef
2 changed files with 15 additions and 11 deletions
+1
View File
@@ -241,6 +241,7 @@ function ws_addDefaultMethods( $arr )
'maxValue' => $conf['available_permission_levels']
),
'resize' => array('default' => false),
'check_uniqueness' => array('default' => true),
),
'POST method only.
<br><b>categories</b> is a string list "category_id[,rank];category_id[,rank]" The rank is optional and is equivalent to "auto" if not given.'