Changeset 16351

Timestamp:

11/13/2010 06:18:45 PM (16 years ago)

Author:

scribu

Message:

Split get_search_sql(). See #15170. See #15032

Location:

trunk/wp-includes

Files:

• class-wp-object-query.php (modified) (1 diff)
• comment.php (modified) (1 diff)
• user.php (modified) (1 diff)

trunk/wp-includes/class-wp-object-query.php

@@ -71 +71 @@
                 $qv['meta_query'] = $meta_query;
         }
-
-        /*
-         * Used internally to generate an SQL string for searching across multiple columns
-         *
-         * @access protected
-         * @since 3.1.0
-         *
-         * @param string $string
-         * @param array $cols
-         * @param bool $wild Whether to allow trailing wildcard searches. Default is false.
-         * @return string
-         */
-        function get_search_sql( $string, $cols, $wild = false ) {
-                $string = esc_sql( $string );
-
-                $searches = array();
-                $wild_char = ( $wild ) ? '%' : '';
-                foreach ( $cols as $col ) {
-                        if ( 'ID' == $col )
-                                $searches[] = "$col = '$string'";
-                        else
-                                $searches[] = "$col LIKE '$string$wild_char'";
-                }
-
-                return ' AND (' . implode(' OR ', $searches) . ')';
-        }
 }
 

trunk/wp-includes/comment.php

@@ -342 +342 @@
                 return $comments;
         }
+
+        /*
+         * Used internally to generate an SQL string for searching across multiple columns
+         *
+         * @access protected
+         * @since 3.1.0
+         *
+         * @param string $string
+         * @param array $cols
+         * @return string
+         */
+        function get_search_sql( $string, $cols ) {
+                $string = esc_sql( $string );
+
+                $searches = array();
+                foreach ( $cols as $col )
+                        $searches[] = "$col LIKE '%$string%'";
+
+                return ' AND (' . implode(' OR ', $searches) . ')';
+        }
 }
 

trunk/wp-includes/user.php

@@ -527 +527 @@
         }
 
+        /*
+         * Used internally to generate an SQL string for searching across multiple columns
+         *
+         * @access protected
+         * @since 3.1.0
+         *
+         * @param string $string
+         * @param array $cols
+         * @param bool $wild Whether to allow trailing wildcard searches. Default is false.
+         * @return string
+         */
+        function get_search_sql( $string, $cols, $wild = false ) {
+                $string = esc_sql( $string );
+
+                $searches = array();
+                $wild_char = ( $wild ) ? '%' : '';
+                foreach ( $cols as $col ) {
+                        if ( 'ID' == $col )
+                                $searches[] = "$col = '$string'";
+                        else
+                                $searches[] = "$col LIKE '$string$wild_char'";
+                }
+
+                return ' AND (' . implode(' OR ', $searches) . ')';
+        }
+
         /**
          * Return the list of users