Changeset 12739

Timestamp:

Dec 16, 2011, 10:10:30 AM (12 years ago)

Author:

plg

Message:

merge r12738 from branch 2.3 to trunk

feature 2489 updated: photos added by synchronization can't update their "file" field

File:

• trunk/include/ws_functions.inc.php (modified) (2 diffs)

trunk/include/ws_functions.inc.php

@@ -2428 +2428 @@
 
   $info_columns = array(
-    'file',
     'name',
     'author',
@@ -2464 +2463 @@
   }
 
+  if (isset($params['file']))
+  {
+    if (!empty($image_row['storage_category_id']))
+    {
+      new PwgError(500, '[ws_images_setInfo] updating "file" is forbidden on photos added by synchronization');
+      exit();
+    }
+
+    $update['file'] = $params['file'];
+  }
+
   if (count(array_keys($update)) > 0)
   {