Changeset 12726 for trunk/include

Timestamp:

Dec 13, 2011, 3:42:54 PM (13 years ago)

Author:

plg

Message:

merge r12725 from branch 2.3 to trunk

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

File:

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

trunk/include/ws_functions.inc.php

@@ -1635 +1635 @@
 
   // does the image already exists ?
-  if ('md5sum' == $conf['uniqueness_mode'])
-  {
-    $where_clause = "md5sum = '".$params['original_sum']."'";
-  }
-  if ('filename' == $conf['uniqueness_mode'])
-  {
-    $where_clause = "file = '".$params['original_filename']."'";
-  }
-
-  $query = '
+  if ($params['check_uniqueness'])
+  {
+    if ('md5sum' == $conf['uniqueness_mode'])
+    {
+      $where_clause = "md5sum = '".$params['original_sum']."'";
+    }
+    if ('filename' == $conf['uniqueness_mode'])
+    {
+      $where_clause = "file = '".$params['original_filename']."'";
+    }
+
+    $query = '
 SELECT
     COUNT(*) AS counter
@@ -1650 +1652 @@
   WHERE '.$where_clause.'
 ;';
-  list($counter) = pwg_db_fetch_row(pwg_query($query));
-  if ($counter != 0) {
-    return new PwgError(500, 'file already exists');
+    list($counter) = pwg_db_fetch_row(pwg_query($query));
+    if ($counter != 0) {
+      return new PwgError(500, 'file already exists');
+    }
   }