Wordpress 2.0.4

[autoinstalls/wordpress.git] / wp-includes / vars.php

diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index 705d8b254629ea1284bf4e2b566104aa0ae9ff72..2573b27eb3595e033c6e81e7080d03b3e98e1dbe 100644 (file)
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -1,7 +1,7 @@
 <?php
 
 // On which page are we ?
-if (preg_match('#([^/]+.php)#', $PHP_SELF, $self_matches)) {
+if (preg_match('#([^/]+\.php)$#', $PHP_SELF, $self_matches)) {
        $pagenow = $self_matches[1];
 } else if (strstr($PHP_SELF, '?')) {
        $pagenow = explode('/', $PHP_SELF);
@@ -14,20 +14,18 @@ if (preg_match('#([^/]+.php)#', $PHP_SELF, $self_matches)) {
 
 // Simple browser detection
 $is_lynx = 0; $is_gecko = 0; $is_winIE = 0; $is_macIE = 0; $is_opera = 0; $is_NS4 = 0;
-if (!isset($HTTP_USER_AGENT)) {
-       $HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT'];
-}
-if (preg_match('/Lynx/', $HTTP_USER_AGENT)) {
+
+if (preg_match('/Lynx/', $_SERVER['HTTP_USER_AGENT'])) {
        $is_lynx = 1;
-} elseif (preg_match('/Gecko/', $HTTP_USER_AGENT)) {
+} elseif (preg_match('/Gecko/', $_SERVER['HTTP_USER_AGENT'])) {
        $is_gecko = 1;
-} elseif ((preg_match('/MSIE/', $HTTP_USER_AGENT)) && (preg_match('/Win/', $HTTP_USER_AGENT))) {
+} elseif ((preg_match('/MSIE/', $_SERVER['HTTP_USER_AGENT'])) && (preg_match('/Win/', $_SERVER['HTTP_USER_AGENT']))) {
        $is_winIE = 1;
-} elseif ((preg_match('/MSIE/', $HTTP_USER_AGENT)) && (preg_match('/Mac/', $HTTP_USER_AGENT))) {
+} elseif ((preg_match('/MSIE/', $_SERVER['HTTP_USER_AGENT'])) && (preg_match('/Mac/', $_SERVER['HTTP_USER_AGENT']))) {
        $is_macIE = 1;
-} elseif (preg_match('/Opera/', $HTTP_USER_AGENT)) {
+} elseif (preg_match('/Opera/', $_SERVER['HTTP_USER_AGENT'])) {
        $is_opera = 1;
-} elseif ((preg_match('/Nav/', $HTTP_USER_AGENT) ) || (preg_match('/Mozilla\/4\./', $HTTP_USER_AGENT))) {
+} elseif ((preg_match('/Nav/', $_SERVER['HTTP_USER_AGENT']) ) || (preg_match('/Mozilla\/4\./', $_SERVER['HTTP_USER_AGENT']))) {
        $is_NS4 = 1;
 }
 $is_IE    = (($is_macIE) || ($is_winIE));
@@ -44,64 +42,53 @@ if ( isset($_SERVER['HTTP_PC_REMOTE_ADDR']) )
 // if the config file does not provide the smilies array, let's define it here
 if (!isset($wpsmiliestrans)) {
        $wpsmiliestrans = array(
-       ' :)'        => 'icon_smile.gif',
-       ' :D'        => 'icon_biggrin.gif',
-       ' :-D'       => 'icon_biggrin.gif',
-       ':grin:'    => 'icon_biggrin.gif',
-       ' :)'        => 'icon_smile.gif',
-       ' :-)'       => 'icon_smile.gif',
-       ':smile:'   => 'icon_smile.gif',
-       ' :('        => 'icon_sad.gif',
-       ' :-('       => 'icon_sad.gif',
-       ':sad:'     => 'icon_sad.gif',
-       ' :o'        => 'icon_surprised.gif',
-       ' :-o'       => 'icon_surprised.gif',
-       ':eek:'     => 'icon_surprised.gif',
-       ' 8O'        => 'icon_eek.gif',
-       ' 8-O'       => 'icon_eek.gif',
-       ':shock:'   => 'icon_eek.gif',
-       ' :?'        => 'icon_confused.gif',
-       ' :-?'       => 'icon_confused.gif',
-       ' :???:'     => 'icon_confused.gif',
-       ' 8)'        => 'icon_cool.gif',
-       ' 8-)'       => 'icon_cool.gif',
-       ':cool:'    => 'icon_cool.gif',
-       ':lol:'     => 'icon_lol.gif',
-       ' :x'        => 'icon_mad.gif',
-       ' :-x'       => 'icon_mad.gif',
-       ':mad:'     => 'icon_mad.gif',
-       ' :P'        => 'icon_razz.gif',
-       ' :-P'       => 'icon_razz.gif',
-       ':razz:'    => 'icon_razz.gif',
-       ':oops:'    => 'icon_redface.gif',
-       ':cry:'     => 'icon_cry.gif',
-       ':evil:'    => 'icon_evil.gif',
-       ':twisted:' => 'icon_twisted.gif',
-       ':roll:'    => 'icon_rolleyes.gif',
-       ':wink:'    => 'icon_wink.gif',
-       ' ;)'        => 'icon_wink.gif',
-       ' ;-)'       => 'icon_wink.gif',
-       ':!:'       => 'icon_exclaim.gif',
-       ':?:'       => 'icon_question.gif',
-       ':idea:'    => 'icon_idea.gif',
-       ':arrow:'   => 'icon_arrow.gif',
-       ' :|'        => 'icon_neutral.gif',
-       ' :-|'       => 'icon_neutral.gif',
-       ':neutral:' => 'icon_neutral.gif',
-       ':mrgreen:' => 'icon_mrgreen.gif',
+       ':mrgreen:'     => 'icon_mrgreen.gif',
+       ':neutral:'     => 'icon_neutral.gif',
+       ':twisted:'     => 'icon_twisted.gif',
+       ':arrow:'       => 'icon_arrow.gif',
+       ':shock:'       => 'icon_eek.gif',
+       ':smile:'       => 'icon_smile.gif',
+       ' :???:'        => 'icon_confused.gif',
+       ':cool:'        => 'icon_cool.gif',
+       ':evil:'        => 'icon_evil.gif',
+       ':grin:'        => 'icon_biggrin.gif',
+       ':idea:'        => 'icon_idea.gif',
+       ':oops:'        => 'icon_redface.gif',
+       ':razz:'        => 'icon_razz.gif',
+       ':roll:'        => 'icon_rolleyes.gif',
+       ':wink:'        => 'icon_wink.gif',
+       ':cry:'         => 'icon_cry.gif',
+       ':eek:'         => 'icon_surprised.gif',
+       ':lol:'         => 'icon_lol.gif',
+       ':mad:'         => 'icon_mad.gif',
+       ':sad:'         => 'icon_sad.gif',
+       ' 8-)'          => 'icon_cool.gif',
+       ' 8-O'          => 'icon_eek.gif',
+       ' :-('          => 'icon_sad.gif',
+       ' :-)'          => 'icon_smile.gif',
+       ' :-?'          => 'icon_confused.gif',
+       ' :-D'          => 'icon_biggrin.gif',
+       ' :-P'          => 'icon_razz.gif',
+       ' :-o'          => 'icon_surprised.gif',
+       ' :-x'          => 'icon_mad.gif',
+       ' :-|'          => 'icon_neutral.gif',
+       ' ;-)'          => 'icon_wink.gif',
+       ' 8)'           => 'icon_cool.gif',
+       ' 8O'           => 'icon_eek.gif',
+       ' :('           => 'icon_sad.gif',
+       ' :)'           => 'icon_smile.gif',
+       ' :?'           => 'icon_confused.gif',
+       ' :D'           => 'icon_biggrin.gif',
+       ' :P'           => 'icon_razz.gif',
+       ' :o'           => 'icon_surprised.gif',
+       ' :x'           => 'icon_mad.gif',
+       ' :|'           => 'icon_neutral.gif',
+       ' ;)'           => 'icon_wink.gif',
+       ':!:'           => 'icon_exclaim.gif',
+       ':?:'           => 'icon_question.gif',
        );
 }
 
-// sorts the smilies' array
-if (!function_exists('smiliescmp')) {
-function smiliescmp ($a, $b) {
-       if (strlen($a) == strlen($b)) {
-               return strcmp($a, $b);
-       }
-               return (strlen($a) > strlen($b)) ? -1 : 1;
-       }
-}
-uksort($wpsmiliestrans, 'smiliescmp');
 
 // generates smilies' search & replace arrays
 foreach($wpsmiliestrans as $smiley => $img) {