summaryrefslogtreecommitdiffstats
path: root/wp-includes/functions.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-09-21 10:47:51 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-09-21 10:47:51 +0000
commit659852f4d4a6da8a8147d4fe73cd55a4e83d2264 (patch)
treeb7944d764b51e9789f0cd7f061512fa9c085d807 /wp-includes/functions.php
parenta194fea75f7340d53134ff1ecfa5969b03735576 (diff)
downloadwordpress-mu-659852f4d4a6da8a8147d4fe73cd55a4e83d2264.tar.gz
wordpress-mu-659852f4d4a6da8a8147d4fe73cd55a4e83d2264.tar.xz
wordpress-mu-659852f4d4a6da8a8147d4fe73cd55a4e83d2264.zip
WP Merge to rev 4201
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@763 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/functions.php')
-rw-r--r--wp-includes/functions.php32
1 files changed, 31 insertions, 1 deletions
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 1401b7b..1bd1487 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1131,6 +1131,12 @@ function wp_die($message, $title = '') {
if ( empty($title) )
$title = __('WordPress &rsaquo; 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">
<html xmlns="http://www.w3.org/1999/xhtml">
@@ -1176,7 +1182,7 @@ function wp_die($message, $title = '') {
</style>
</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>
</html>
@@ -1185,4 +1191,28 @@ function wp_die($message, $title = '') {
die();
}
+function _mce_set_direction() {
+ global $wp_locale;
+ if ('rtl' == $wp_locale->text_direction)
+ echo 'directionality : "rtl" ,';
+}
+
+function _mce_load_rtl_plugin($input) {
+ global $wp_locale;
+ if ('rtl' == $wp_locale->text_direction)
+ $input[] = 'directionality';
+
+ return $input;
+}
+
+function _mce_add_direction_buttons($input) {
+ global $wp_locale;
+ if ('rtl' == $wp_locale->text_direction) {
+ $new_buttons = array('separator', 'ltr', 'rtl');
+ $input = array_merge($input, $new_buttons);
+ }
+
+ return $input;
+}
+
?>