Changeset 6501

Timestamp:

Jun 9, 2010, 11:57:57 AM (14 years ago)

Author:

nikrou

Message:

Bug 1716 fixed : SQLite: Check upgrades failed in intro
Incorrect use of dependant database function
Fixed same problem in ws functions

merge from trunk

Location:

branches/2.1

Files:

• include/ws_functions.inc.php (modified) (2 diffs)
• plugins/c13y_upgrade/initialize.inc.php (modified) (2 diffs)

branches/2.1/include/ws_functions.inc.php

@@ -1144 +1144 @@
   WHERE id = '.$params['image_id'].'
 ;';
-  list($file_path, $original_sum) = mysql_fetch_row(pwg_query($query));
+  list($file_path, $original_sum) = pwg_db_fetch_row(pwg_query($query));
 
   // TODO only files added with web API can be updated with web API
@@ -1713 +1713 @@
 ;';
   $result = pwg_query($query);
-  if (mysql_num_rows($result) == 0) {
+  if (pwg_db_num_rows($result) == 0) {
     return new PwgError(404, "image_id not found");
   }
-  list($path) = mysql_fetch_row($result);
+  list($path) = pwg_db_fetch_row($result);
 
   $ret = array();

branches/2.1/plugins/c13y_upgrade/initialize.inc.php

@@ -51 +51 @@
 ;';
 
-  if (mysql_fetch_array(pwg_query($query)))
+  if (pwg_db_fetch_array(pwg_query($query)))
   {
     $to_deactivate = false;
@@ -81 +81 @@
 
   $result = pwg_query($query);
-  while ($row = mysql_fetch_assoc($result))
+  while ($row = pwg_db_fetch_assoc($result))
   {
     $to_deactivate = false;