Changeset 1663

Timestamp:

09/15/2004 08:16:58 AM (20 years ago)

Author:

rboren

Message:

Make $pagenow work with PATH_INFO.

File:

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

trunk/wp-includes/vars.php

@@ -38 +38 @@
     'ž' => '',
     'Ÿ' => 'Ÿ'
-);
+    );
 
 // On which page are we ?
 $PHP_SELF = $_SERVER['PHP_SELF'];
-$pagenow = explode('/', $PHP_SELF);
-$pagenow = trim($pagenow[(sizeof($pagenow)-1)]);
-$pagenow = explode('?', $pagenow);
-$pagenow = $pagenow[0];
-if (($querystring_start == '/') && ($pagenow != 'post.php')) {
-    $pagenow = get_settings('siteurl') . '/' . get_settings('blogfilename');
+if (preg_match('#([^/]+.php)#', $PHP_SELF, $self_matches)) {
+    $pagenow = $self_matches[1];
+} else {
+    $pagenow = explode('/', $PHP_SELF);
+    $pagenow = trim($pagenow[(sizeof($pagenow)-1)]);
+    $pagenow = explode('?', $pagenow);
+    $pagenow = $pagenow[0];
+    if (($querystring_start == '/') && ($pagenow != 'post.php')) {
+        $pagenow = get_settings('siteurl') . '/' . get_settings('blogfilename');
+    }
 }