WP Merge 5509

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@976 7be80a69-a1ef-0310-a953-fb0f7c49ff36

4 files changed, 4 insertions, 6 deletions

diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index bbd5e22..7da6129 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -88,7 +88,7 @@ $comments = array_slice($_comments, 0, 20);
 $extra_comments = array_slice($_comments, 20);
 
 $page_links = paginate_links( array(
-	'base' => add_query_arg( 'apage', '%_%' ), 
+	'base' => add_query_arg( 'apage', '%#%' ), 
 	'format' => '',
 	'total' => ceil($total / 20),
 	'current' => $page
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 97b9915..1d2edc1 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1348,7 +1348,7 @@ function wp_nonce_ays($action) {
 function wp_die( $message, $title = '' ) {
 	global $wp_locale;
 
-	if ( is_wp_error( $message ) ) {
+	if ( function_exists( 'is_wp_error' ) && is_wp_error( $message ) ) {
 		if ( empty($title) ) {
 			$error_data = $message->get_error_data();
 			if ( is_array($error_data) && isset($error_data['title']) )
diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index c251935..51513bc 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -103,7 +103,7 @@ function get_theme_data( $theme_file ) {
 		$author = sprintf( '<a href="%1$s" title="%2$s">%3$s</a>', $author_uri, __( 'Visit author homepage' ), wp_kses( trim( $author_name[1] ), $themes_allowed_tags ) );
 	}
 
-	return array( 'Name' => $name, 'Title' => $theme, 'URI' => $theme_uri, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1], 'Status' => $status );
+	return array( 'Name' => $name, 'Title' => $theme, 'URI' => $theme_uri, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template, 'Status' => $status );
 }
 
 function get_themes() {
diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
index 6365261..7eae8b0 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -523,12 +523,10 @@ function wp_widget_text($args, $number = 1) {
 	extract($args);
 	$options = get_option('widget_text');
 	$title = $options[$number]['title'];
-	if ( empty($title) )
-		$title = '&nbsp;';
 	$text = apply_filters( 'the_content', $options[$number]['text'] );
 ?>
 		<?php echo $before_widget; ?>
-			<?php !empty( $title ) ? print($before_title . $title . $after_title) : null; ?>
+			<?php if ( !empty( $title ) ) { echo $before_title . $title . $after_title; } ?>
 			<div class="textwidget"><?php echo $text; ?></div>
 		<?php echo $after_widget; ?>
 <?php