Changeset 10322 for trunk/wp-includes/functions.php

Timestamp:

01/06/2009 06:20:47 PM (18 years ago)

Author:

ryan

Message:

Faster smilies. Props johanee. fixes #6464

File:

• trunk/wp-includes/functions.php (modified) (4 diffs)

trunk/wp-includes/functions.php

@@ -2367 +2367 @@
 }
 
+
 /**
  * Convert smiley code to the icon graphic file equivalent.
@@ -2377 +2378 @@
  * image file.
  *
- * The $wp_smiliessearch global is for the regular expression array and is
- * set each time the function is called. The $wp_smiliesreplace is the full
- * replacement. Supposely, the $wp_smiliessearch array is looped over using
- * preg_replace() or just setting the array of $wp_smiliessearch along with the
- * array of $wp_smiliesreplace in the search and replace parameters of
- * preg_replace(), which would be faster and less overhead. Either way, both are
- * used with preg_replace() and can be defined after the function is called.
+ * The $wp_smiliessearch global is for the regular expression and is set each
+ * time the function is called.
  *
  * The full list of smilies can be found in the function and won't be listed in
@@ -2390 +2386 @@
  *
  * @global array $wpsmiliestrans
- * @global array $wp_smiliesreplace
  * @global array $wp_smiliessearch
  * @since 2.2.0
  */
 function smilies_init() {
-        global $wpsmiliestrans, $wp_smiliessearch, $wp_smiliesreplace;
+        global $wpsmiliestrans, $wp_smiliessearch;
 
         // don't bother setting up smilies if they are disabled
@@ -2450 +2445 @@
         }
 
-        $siteurl = get_option( 'siteurl' );
+        if (count($wpsmiliestrans) == 0) {
+                return;
+        }
+
+        /*
+         * NOTE: we sort the smilies in reverse key order. This is to make sure
+         * we match the longest possible smilie (:???: vs :?) as the regular
+         * expression used below is first-match
+         */
+        krsort($wpsmiliestrans);
+
+        $wp_smiliessearch = '/(?:\s|^)';
+
+        $subchar = '';
         foreach ( (array) $wpsmiliestrans as $smiley => $img ) {
-                $wp_smiliessearch[] = '/(\s|^)' . preg_quote( $smiley, '/' ) . '(\s|$)/';
-                $smiley_masked = attribute_escape( trim( $smiley ) );
-                $wp_smiliesreplace[] = " <img src='$siteurl/wp-includes/images/smilies/$img' alt='$smiley_masked' class='wp-smiley' /> ";
-        }
+                $firstchar = substr($smiley, 0, 1);
+                $rest = substr($smiley, 1);
+
+                // new subpattern?
+                if ($firstchar != $subchar) {
+                        if ($subchar != '') {
+                                $wp_smiliessearch .= ')|';
+                        }
+                        $subchar = $firstchar;
+                        $wp_smiliessearch .= preg_quote($firstchar, '/') . '(?:';
+                } else {
+                        $wp_smiliessearch .= '|';
+                }
+                $wp_smiliessearch .= preg_quote($rest);
+        }
+
+        $wp_smiliessearch .= ')(?:\s|$)/';
 }