https://www.mediawiki.org/wiki/Special:Code/MediaWiki/110199

Revision: 110199
Author:   yaron
Date:     2012-01-28 00:45:51 +0000 (Sat, 28 Jan 2012)
Log Message:
-----------
Follow-up to r110185 - missed one section of the patch

Modified Paths:
--------------
    trunk/extensions/SemanticForms/includes/SF_Utils.php

Modified: trunk/extensions/SemanticForms/includes/SF_Utils.php
===================================================================
--- trunk/extensions/SemanticForms/includes/SF_Utils.php        2012-01-28 
00:43:55 UTC (rev 110198)
+++ trunk/extensions/SemanticForms/includes/SF_Utils.php        2012-01-28 
00:45:51 UTC (rev 110199)
@@ -607,12 +607,10 @@
                }
 
                $db = wfGetDB( DB_SLAVE );
-               $conditions = "page_namespace = $matchingNamespaceCode";
+               $conditions = array();
+               $conditions['page_namespace'] = $matchingNamespaceCode;
                if ( $substring != null ) {
-                       $substring = str_replace( ' ', '_', strtolower( 
$substring ) );
-                       $substring = str_replace( '_', '\_', $substring );
-                       $substring = str_replace( "'", "\'", $substring );
-                       $conditions .= " AND (LOWER(CONVERT(`page_title` USING 
utf8)) LIKE '$substring%' OR LOWER(CONVERT(`page_title` USING utf8)) LIKE 
'%\_$substring%')";
+                       $conditions[] = 
SFUtils::getSQLConditionForAutocompleteInColumn( 'page_title', $substring );
                }
                $res = $db->select( 'page',
                        'page_title',


_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to