Changeset 6655

Timestamp:

07/03/10 14:22:58 (3 years ago)

Author:

nikrou

Message:

Bug 1755 fixed : Needs single quotes in queries official plugins
Merge from trunk

Location:

branches/2.1

Files:

• admin/include/functions_upgrade.php (modified) (2 diffs)
• include/functions_category.inc.php (modified) (1 diff)
• picture.php (modified) (1 diff)
• plugins/LocalFilesEditor/maintain.inc.php (modified) (2 diffs)
• plugins/c13y_upgrade/initialize.inc.php (modified) (1 diff)

branches/2.1/admin/include/functions_upgrade.php

@@ -87 +87 @@
 SELECT id
 FROM '.PREFIX_TABLE.'plugins
-WHERE state = "active"
+WHERE state = \'active\'
 AND id NOT IN (\'' . implode('\',\'', $standard_plugins) . '\')
 ;';
@@ -102 +102 @@
     $query = '
 UPDATE '.PREFIX_TABLE.'plugins
-SET state="inactive"
+SET state=\'inactive\'
 WHERE id IN (\'' . implode('\',\'', $plugins) . '\')
 ;';

branches/2.1/include/functions_category.inc.php

@@ -432 +432 @@
         $query='
 UPDATE '.OLD_PERMALINKS_TABLE.' SET last_hit=NOW(), hit=hit+1
-  WHERE permalink="'.$permalinks[$i].'" AND cat_id='.$cat_id.'
+  WHERE permalink=\''.$permalinks[$i].'\' AND cat_id='.$cat_id.'
   LIMIT 1';
         pwg_query($query);

branches/2.1/picture.php

@@ -53 +53 @@
   {// url given by file name
     assert( !empty($page['image_file']) );
-    $query .= 'file LIKE "' .
+    $query .= 'file LIKE \'' .
       str_replace(array('_','%'), array('/_','/%'), $page['image_file'] ).
-      '.%" ESCAPE "/" LIMIT 1';
+      '.%\' ESCAPE \'/\' LIMIT 1';
   }
   if ( ! ( $row = pwg_db_fetch_assoc(pwg_query($query)) ) )

branches/2.1/plugins/LocalFilesEditor/maintain.inc.php

@@ -28 +28 @@
   $query = '
 INSERT INTO ' . CONFIG_TABLE . ' (param,value,comment)
-VALUES ("LocalFilesEditor" , "off" , "LocalFiles Editor plugin parameters");';
+VALUES (\'LocalFilesEditor\' , \'off\' , \'LocalFiles Editor plugin parameters\');';
 
   pwg_query($query);
@@ -37 +37 @@
   global $prefixeTable;
 
-  $query = 'DELETE FROM ' . CONFIG_TABLE . ' WHERE param="LocalFilesEditor" LIMIT 1;';
+  $query = 'DELETE FROM ' . CONFIG_TABLE . ' WHERE param=\'LocalFilesEditor\' LIMIT 1;';
   pwg_query($query);
 }

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

@@ -48 +48 @@
   upper('.$conf['user_fields']['email'].')
 having count(*) > 1
-limit 0,1
+limit 1
 ;';