summaryrefslogtreecommitdiffstats
path: root/wp-admin
diff options
context:
space:
mode:
Diffstat (limited to 'wp-admin')
-rw-r--r--wp-admin/edit.php2
-rw-r--r--wp-admin/upgrade-functions.php7
-rw-r--r--wp-admin/wp-admin.css1
3 files changed, 8 insertions, 2 deletions
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 44a3ddb..47f5ad8 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -64,7 +64,7 @@ if ( is_month() ) {
printf(__('Search for “%s”'), wp_specialchars($_GET['s']) );
} else {
if ( is_single() )
- printf(__('Comments on %s'), $post->post_title);
+ printf(__('Comments on %s'), apply_filters( "the_title", $post->post_title));
elseif ( ! is_paged() || get_query_var('paged') == 1 )
_e('Last 15 Posts');
else
diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index b7a1f93..35095d0 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -21,7 +21,12 @@ function wp_install($blog_title, $user_name, $user_email, $public, $meta='') {
update_option('admin_email', $user_email);
update_option('blog_public', $public);
$schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
- $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+
+ if ( defined('WP_SITEURL') && '' != WP_SITEURL )
+ $guessurl = WP_SITEURL;
+ else
+ $guessurl = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+
update_option('siteurl', $guessurl);
// If not a public blog, don't ping.
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index d3d7b1f..6de69f4 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -488,6 +488,7 @@ input.disabled, textarea.disabled {
line-height: 200%;
list-style: none;
text-align: center;
+ white-space: nowrap;
}
#adminmenu a.current {