Changeset 612 for trunk/wp-settings.php

Timestamp:

12/15/2003 08:02:19 AM (22 years ago)

Author:

saxmatt

Message:

Smilie fix from Jaykul, changed fool's siteurl fix to use faster preg_replace. Now handles *any number* of trailing slashes. :)

File:

• trunk/wp-settings.php (modified) (3 diffs)

trunk/wp-settings.php

@@ -7 +7 @@
 require ($abspath . $b2inc . '/functions.php');
 require ($abspath . $b2inc . '/template-functions.php');
-require ($abspath . $b2inc . '/vars.php');
 require ($abspath . $b2inc . '/class-xmlrpc.php');
 require ($abspath . $b2inc . '/class-xmlrpcs.php');
@@ -41 +40 @@
     // "When trying to design a foolproof system, 
     //  never underestimate the ingenuity of the fools :)"
-    //
-    // Strip trailing slashes from $siteurl. But don't do
-    // anything that could cause an infinite loop.
-    while (('/' == substr($siteurl, -1)) && (10 > $i++)) {
-        $siteurl = substr($siteurl, 0, -1);
-    }
+
+    $siteurl = preg_replace('|/+$|', '', $siteurl);
     $blogfilename = get_settings('blogfilename');
     $blogname = get_settings('blogname');
@@ -103 +98 @@
 
 } //end !$_wp_installing
+
+require ($abspath . $b2inc . '/vars.php');
 ?>