Changeset 6066

Timestamp:

09/10/2007 02:06:29 PM (17 years ago)

Author:

markjaquith

Message:

Better $pagenow determination. fixes #4748 for 2.0

File:

• branches/2.0/wp-includes/vars.php (modified) (1 diff)

branches/2.0/wp-includes/vars.php

@@ -2 +2 @@
 
 // On which page are we ?
-if (preg_match('#([^/]+\.php)$#', $PHP_SELF, $self_matches)) {
+if ( is_admin() ) {
+    // wp-admin pages are checked more carefully
+    preg_match('#/wp-admin/?(.*?)$#i', $PHP_SELF, $self_matches);
     $pagenow = $self_matches[1];
-} else if (strstr($PHP_SELF, '?')) {
-    $pagenow = explode('/', $PHP_SELF);
-    $pagenow = trim($pagenow[(sizeof($pagenow)-1)]);
-    $pagenow = explode('?', $pagenow);
-    $pagenow = $pagenow[0];
+    $pagenow = preg_replace('#\?.*?$#', '', $pagenow);
+    if ( '' === $pagenow || 'index' === $pagenow || 'index.php' === $pagenow ) {
+        $pagenow = 'index.php';
+    } else {
+        preg_match('#(.*?)(/|$)#', $pagenow, $self_matches);
+        $pagenow = strtolower($self_matches[1]);
+        if ( '.php' !== substr($pagenow, -4, 4) )
+            $pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
+    }
 } else {
-    $pagenow = 'index.php';
+    if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $PHP_SELF, $self_matches) )
+        $pagenow = strtolower($self_matches[1]);
+    else
+        $pagenow = 'index.php';
 }