Changeset 25054

Timestamp:

08/20/2013 05:56:22 AM (11 years ago)

Author:

dd32

Message:

Simplify _deep_replace() by removing it's obscure looping and replacement checking logic, and instead, using the PHP5 $count parameter of str_replace(). Props hakre. Fixes #16903

File:

• trunk/src/wp-includes/formatting.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

@@ -2571 +2571 @@
  * @access private
  *
- * @param string|array $search
- * @param string $subject
- * @return string The processed string
+ * @param string|array $search The value being searched for, otherwise known as the needle. An array may be used to designate multiple needles.
+ * @param string $subject The string being searched and replaced on, otherwise known as the haystack.
+ * @return string The string with the replaced svalues.
  */
 function _deep_replace( $search, $subject ) {
-    $found = true;
     $subject = (string) $subject;
-    while ( $found ) {
-        $found = false;
-        foreach ( (array) $search as $val ) {
-            while ( strpos( $subject, $val ) !== false ) {
-                $found = true;
-                $subject = str_replace( $val, '', $subject );
-            }
-        }
+
+    $count = 1;
+    while ( $count ) {
+        $subject = str_replace( $search, '', $subject, $count );
     }