Changeset 4194

Timestamp:

09/18/2006 11:40:19 PM (20 years ago)

Author:

ryan

Message:

Fix logo link in wp_die(). Props Sewar. fixes #3138

Location:

trunk

Files:

• wp-admin/admin-header.php (modified) (1 diff)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/locale.php (modified) (2 diffs)
• wp-includes/theme.php (modified) (2 diffs)

trunk/wp-admin/admin-header.php

@@ -19 +19 @@
 <title><?php bloginfo('name') ?> &rsaquo; <?php echo $title; ?> &#8212; WordPress</title>
 <link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+<?php if ( ('rtl' == $wp_locale->text_direction) ) : ?>
+<link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/rtl.css?version=<?php bloginfo('version'); ?>" type="text/css" />
+<?php endif; ?> 
 <script type="text/javascript">
 //<![CDATA[

trunk/wp-includes/default-filters.php

@@ -145 +145 @@
 // Actions
 add_action('wp_head', 'rsd_link');
+add_action('wp_head', 'locale_stylesheet');
 add_action('publish_future_post', 'wp_publish_post', 10, 1);
 add_action('wp_head', 'noindex', 1);

trunk/wp-includes/functions.php

@@ -1112 +1112 @@
         if ( empty($title) )
                 $title = __('WordPress › Error');
+
+        if ( strstr($_SERVER['PHP_SELF'], 'wp-admin') )
+                $logo_src = 'images/wordpress-logo.png';
+        else
+                $logo_src = 'wp-admin/images/wordpress-logo.png';
+
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -1157 +1163 @@
 </head>
 <body>
-        <h1 id="logo"><img alt="WordPress" src="<?php echo get_option('siteurl'); ?>/wp-admin/images/wordpress-logo.png" /></h1>
+        <h1 id="logo"><img alt="WordPress" src="<?php echo $logo_src; ?>" /></h1>
         <p><?php echo $message; ?></p>
 </body>

trunk/wp-includes/locale.php

@@ -12 +12 @@
 
         var $meridiem;
+
+        var $text_direction = '';
+        var $locale_vars = array('text_direction');
 
         function init() {
@@ -84 +87 @@
                 $this->meridiem['AM'] = __('AM');
                 $this->meridiem['PM'] = __('PM');
+
+                $this->_load_locale_data();
+        }
+
+        function _load_locale_data() {
+                $locale = get_locale();
+                $locale_file = ABSPATH . "wp-includes/languages/$locale.php";
+                if ( !file_exists($locale_file) )
+                        return;
+
+                include($locale_file);
+
+                foreach ( $this->locale_vars as $var ) {
+                        $this->$var = $$var;    
+                }
         }
 

trunk/wp-includes/theme.php

@@ -24 +24 @@
         $stylesheet_uri = $stylesheet_dir_uri . "/style.css";
         return apply_filters('stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri);
+}
+
+function get_locale_stylesheet_uri() {
+        global $wp_locale;
+        $stylesheet_dir_uri = get_stylesheet_directory_uri();
+        $dir = get_stylesheet_directory();
+        $locale = get_locale();
+        if ( file_exists("$dir/$locale.css") )
+                $stylesheet_uri = "$stylesheet_dir_uri/$locale.css";
+        else if ( !empty($wp_locale->text_direction) && file_exists("$dir/{$wp_locale->text_direction}.css") )
+                $stylesheet_uri = "$stylesheet_dir_uri/{$wp_locale->text_direction}.css";
+        else
+                $stylesheet_uri = '';
+        return apply_filters('locale_stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri);
 }
 
@@ -370 +384 @@
 }
 
+function locale_stylesheet() {
+        $stylesheet = get_locale_stylesheet_uri();
+        if ( empty($stylesheet) )
+                return;
+        echo '<link rel="stylesheet" href="' . $stylesheet . '" type="text/css" media="screen" />';
+}
+
 function validate_current_theme() {
         // Don't validate during an install/upgrade.