';
- if ( 'draft' === $_GET['post_status'] )
- $posts_columns['modified'] = __('Modified');
- elseif ( 'pending' === $_GET['post_status'] )
- $posts_columns['modified'] = __('Submitted');
- else
- $posts_columns['date'] = __('Date');
+
+ $post_status = isset( $_GET['post_status'] ) ? $_GET['post_status'] : '';
+
+ switch( $post_status ) {
+ case 'draft':
+ $posts_columns['modified'] = __('Modified');
+ break;
+ case 'pending':
+ $posts_columns['modified'] = __('Submitted');
+ break;
+ default:
+ $posts_columns['date'] = __('Date');
+ }
+
$posts_columns['title'] = __('Title');
$posts_columns['author'] = __('Author');
- if ( !in_array($_GET['post_status'], array('pending', 'draft', 'future')) )
+ if ( !in_array($post_status, array('pending', 'draft', 'future')) )
$posts_columns['comments'] = '
';
$posts_columns['status'] = __('Status');
$posts_columns = apply_filters('manage_pages_columns', $posts_columns);
@@ -1210,6 +1220,9 @@ function do_meta_boxes($page, $context, $object) {
return;
foreach ( array('high', 'core', 'default', 'low') as $priority ) {
+ if ( ! isset( $wp_meta_boxes[$page][$context][$priority] ) )
+ continue;
+
foreach ( (array) $wp_meta_boxes[$page][$context][$priority] as $box ) {
if ( false === $box )
continue;
diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index ec670ce6a..18a77b37f 100644
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -35,11 +35,13 @@ function get_page_templates() {
foreach ( $templates as $template ) {
$template_data = implode( '', file( WP_CONTENT_DIR.$template ));
- preg_match( '|Template Name:(.*)$|mi', $template_data, $name );
- preg_match( '|Description:(.*)$|mi', $template_data, $description );
+ $name = '';
+ if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) )
+ $name = $name[1];
- $name = $name[1];
- $description = $description[1];
+ $description = '';
+ if( preg_match( '|Description:(.*)$|mi', $template_data, $description ) )
+ $description = $description[1];
if ( !empty( $name ) ) {
$page_templates[trim( $name )] = basename( $template );
diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php
index ffb51d00d..fbc64a31e 100644
--- a/wp-admin/includes/update.php
+++ b/wp-admin/includes/update.php
@@ -7,6 +7,11 @@ function core_update_footer( $msg = '' ) {
return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'] );
$cur = get_option( 'update_core' );
+ if ( ! isset( $cur->current ) )
+ $cur->current = '';
+
+ if ( ! isset( $cur->url ) )
+ $cur->url = '';
switch ( $cur->response ) {
case 'development' :
diff --git a/wp-admin/link-add.php b/wp-admin/link-add.php
index 4b6493b54..c93922bf5 100644
--- a/wp-admin/link-add.php
+++ b/wp-admin/link-add.php
@@ -17,7 +17,7 @@ wp_enqueue_script('xfn');
require('admin-header.php');
?>
-
+
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 48f59f252..7fe4d9ad6 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -79,7 +79,7 @@ if ( isset($_GET['deleted']) ) {
-
+
@@ -150,6 +150,8 @@ if ( $links ) {
link_name = attribute_escape($link->link_name);
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index abf8dc054..7ab966cae 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -27,7 +27,10 @@ $menu[20] = array( sprintf( __('Comments %s'), "