diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-12-23 08:08:28 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-12-23 08:08:28 +0000 |
| commit | 2508632647c3cb9f98814015553a743895bfa5d2 (patch) | |
| tree | 471d5d235b42ffa0e609eee5781ba4b610cd31ff | |
| parent | 7b4d8e6aed1cdf72fc2ee40c3c916377deb0955b (diff) | |
| download | wordpress-mu-2508632647c3cb9f98814015553a743895bfa5d2.tar.gz wordpress-mu-2508632647c3cb9f98814015553a743895bfa5d2.tar.xz wordpress-mu-2508632647c3cb9f98814015553a743895bfa5d2.zip | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@483 7be80a69-a1ef-0310-a953-fb0f7c49ff36
| -rw-r--r-- | wp-inst/wp-admin/admin-db.php | 2 | ||||
| -rw-r--r-- | wp-inst/wp-admin/admin-header.php | 4 | ||||
| -rw-r--r-- | wp-inst/wp-admin/options-discussion.php | 2 | ||||
| -rw-r--r-- | wp-inst/wp-admin/wp-admin.css | 5 | ||||
| -rw-r--r-- | wp-inst/wp-includes/pluggable-functions.php | 4 |
5 files changed, 15 insertions, 2 deletions
diff --git a/wp-inst/wp-admin/admin-db.php b/wp-inst/wp-admin/admin-db.php index 73b59f3..d02303f 100644 --- a/wp-inst/wp-admin/admin-db.php +++ b/wp-inst/wp-admin/admin-db.php @@ -118,7 +118,7 @@ function wp_insert_category($catarr) { $wpdb->query( "UPDATE $wpdb->categories SET category_nicename = '$category_nicename' WHERE cat_ID = '$cat_ID'" ); } - wp_cache_set($cat_ID, get_category($cat_ID), 'category'); + wp_cache_delete($cat_ID, 'category'); if ($update) { do_action('edit_category', $cat_ID); diff --git a/wp-inst/wp-admin/admin-header.php b/wp-inst/wp-admin/admin-header.php index 05d5b38..5b96d78 100644 --- a/wp-inst/wp-admin/admin-header.php +++ b/wp-inst/wp-admin/admin-header.php @@ -315,6 +315,10 @@ function myPload( str ) { <?php endif; ?> +<?php if ( ($parent_file != 'link-manager.php') && ($parent_file != 'options-general.php') ) : ?> +<style type="text/css">* html { overflow-x: hidden; }</style> +<?php endif; ?> + <?php do_action('admin_head'); ?> </head> <body> diff --git a/wp-inst/wp-admin/options-discussion.php b/wp-inst/wp-admin/options-discussion.php index c26ea2e..af2db9a 100644 --- a/wp-inst/wp-admin/options-discussion.php +++ b/wp-inst/wp-admin/options-discussion.php @@ -22,7 +22,7 @@ if ($action == 'retrospam') { <h2><?php _e('Discussion Options') ?></h2> <form method="post" action="options.php"> <fieldset class="options"> -<legend><?php _e('Usual settings for an article: <em>(These settings may be overridden for individual articles.)</em>') ?></legend> +<legend><?php _e('Usual settings for an article:<br /><small><em>(These settings may be overridden for individual articles.)</em></small>') ?></legend> <ul> <li> <label for="default_pingback_flag"> diff --git a/wp-inst/wp-admin/wp-admin.css b/wp-inst/wp-admin/wp-admin.css index 208450b..4168954 100644 --- a/wp-inst/wp-admin/wp-admin.css +++ b/wp-inst/wp-admin/wp-admin.css @@ -1,6 +1,11 @@ * html #poststuff { height: 100%; /* kill peekaboo bug in IE */ } + +/* This is the Holly Hack \*/ +* html .wrap { height: 1% } +/* For Win IE's eyes only */ + body { border: none; } diff --git a/wp-inst/wp-includes/pluggable-functions.php b/wp-inst/wp-includes/pluggable-functions.php index 6a99d69..91198f5 100644 --- a/wp-inst/wp-includes/pluggable-functions.php +++ b/wp-inst/wp-includes/pluggable-functions.php @@ -42,7 +42,9 @@ function get_userdata( $user_id ) { if ( !$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE ID = '$user_id' LIMIT 1") ) return false; + $wpdb->hide_errors(); $metavalues = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user_id'"); + $wpdb->show_errors(); if ($metavalues) { foreach ( $metavalues as $meta ) { @@ -85,7 +87,9 @@ function get_userdatabylogin($user_login) { if ( !$user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_login = '$user_login'") ) return false; + $wpdb->hide_errors(); $metavalues = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user->ID'"); + $wpdb->show_errors(); if ($metavalues) { foreach ( $metavalues as $meta ) { |