Changeset 6665 for branches

Timestamp:

Jul 5, 2010, 11:18:45 PM (14 years ago)

Author:

nikrou

Message:

Bug 1763 fixed : [PostgreSQL] double quote used in queries
Merge from trunk

Location:

branches/2.1

Files:

• admin/include/functions.php (modified) (1 diff)
• admin/include/functions_permalinks.php (modified) (1 diff)
• include/functions_category.inc.php (modified) (1 diff)
• include/functions_search.inc.php (modified) (4 diffs)
• include/section_init.inc.php (modified) (1 diff)
• plugins/LocalFilesEditor/update_config.php (modified) (1 diff)

branches/2.1/admin/include/functions.php

@@ -295 +295 @@
   $query = '
 DELETE FROM '.SESSIONS_TABLE.'
-  WHERE data LIKE "pwg_uid|i:'.(int)$user_id.';%"
+  WHERE data LIKE \'pwg_uid|i:'.(int)$user_id.';%\'
 ;';
   pwg_query($query);

branches/2.1/admin/include/functions_permalinks.php

@@ -48 +48 @@
   FROM '.OLD_PERMALINKS_TABLE.' op INNER JOIN '.CATEGORIES_TABLE.' c
     ON op.cat_id=c.id
-  WHERE op.permalink="'.$permalink.'"
+  WHERE op.permalink=\''.$permalink.'\'
   LIMIT 1';
   $result = pwg_query($query);

branches/2.1/include/functions_category.inc.php

@@ -407 +407 @@
   {
     if ( !empty($in) ) $in.=', ';
-    $in .= '"'.$permalink.'"';
+    $in .= '\''.$permalink.'\'';
   }
   $query ='

branches/2.1/include/functions_search.inc.php

@@ -394 +394 @@
     if ( strlen($tokens[$i])==0)
       continue;
-    $clauses[] = $field.' LIKE "'.$before.addslashes($tokens[$i]).$after.'"';
+    $clauses[] = $field.' LIKE \''.$before.addslashes($tokens[$i]).$after.'\'';
   }
 
@@ -435 +435 @@
 
   // Step 1 - first we find matches in #images table ===========================
-  $where_clauses='MATCH(i.name, i.comment) AGAINST( "'.$q.'" IN BOOLEAN MODE)';
+  $where_clauses='MATCH(i.name, i.comment) AGAINST( \''.$q.'\' IN BOOLEAN MODE)';
   if (!empty($q_like_clause))
   {
@@ -453 +453 @@
   $query = '
 SELECT i.id,
-    MATCH(i.name, i.comment) AGAINST( "'.$q.'" IN BOOLEAN MODE) AS weight
+    MATCH(i.name, i.comment) AGAINST( \''.$q.'\' IN BOOLEAN MODE) AS weight
   FROM '.IMAGES_TABLE.' i
   WHERE '.implode("\n AND ", $where_clauses);
@@ -506 +506 @@
     INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.' ON id=cat_id
   WHERE user_id='.$user['id'].'
-    AND MATCH(name, comment) AGAINST( "'.$q.'" IN BOOLEAN MODE)'.
+    AND MATCH(name, comment) AGAINST( \''.$q.'\' IN BOOLEAN MODE)'.
   get_sql_condition_FandF (
       array( 'visible_categories' => 'cat_id' ), "\n    AND"

branches/2.1/include/section_init.inc.php

@@ -260 +260 @@
   FROM '.CATEGORIES_TABLE.'
   WHERE
-    uppercats LIKE "'.$page['category']['uppercats'].',%" '
+    uppercats LIKE \''.$page['category']['uppercats'].',%\' '
     .get_sql_condition_FandF(
       array

branches/2.1/plugins/LocalFilesEditor/update_config.php

@@ -38 +38 @@
   $query = '
 UPDATE ' . CONFIG_TABLE . '
-SET value = "' . $_POST['editarea'] . '"
-WHERE param="LocalFilesEditor"
+SET value = \'' . $_POST['editarea'] . '\'
+WHERE param=\'LocalFilesEditor\'
 LIMIT 1';
   pwg_query($query);