diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 4c15f52b17..c2c216dec9 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -56,13 +56,13 @@ if ( is_single() ) { $post_status_label = _c('Manage Posts|manage posts header'); if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) ) $post_status_label = $post_stati[$_GET['post_status']][1]; - if ( $post_listing_pageable && !is_archive() && !is_search() ) - $h2_noun = is_paged() ? sprintf(__( 'Previous %s' ), $post_status_label) : sprintf(__('Latest %s'), $post_status_label); - else + //if ( $post_listing_pageable && !is_archive() && !is_search() ) //Unreachable code: $post_listing_pageable is undefined, Similar code in upload.php + // $h2_noun = is_paged() ? sprintf(__( 'Previous %s' ), $post_status_label) : sprintf(__('Latest %s'), $post_status_label); + //else $h2_noun = $post_status_label; // Use $_GET instead of is_ since they can override each other $h2_author = ''; - $_GET['author'] = (int) $_GET['author']; + $_GET['author'] = isset($_GET['author']) ? (int) $_GET['author'] : 0; if ( $_GET['author'] != 0 ) { if ( $_GET['author'] == '-' . $user_ID ) { // author exclusion $h2_author = ' ' . __('by other authors'); @@ -93,7 +93,7 @@ foreach ( $post_stati as $status => $label ) { if ( empty( $num_posts->$status ) ) continue; - if ( $status == $_GET['post_status'] ) + if ( isset($_GET['post_status']) && $status == $_GET['post_status'] ) $class = ' class="current"'; $status_links[] = "
  • " . @@ -146,16 +146,18 @@ $arc_result = $wpdb->get_results( $arc_query ); $month_count = count($arc_result); -if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?> +if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { +$m = isset($_GET['m']) ? (int)$_GET['m'] : 0; +?> '; - if ( 'draft' === $_GET['post_status'] ) + if ( isset($_GET['post_status']) && 'draft' === $_GET['post_status'] ) $posts_columns['modified'] = __('Modified'); - elseif ( 'pending' === $_GET['post_status'] ) + elseif ( isset($_GET['post_status']) && 'pending' === $_GET['post_status'] ) $posts_columns['modified'] = __('Submitted'); else $posts_columns['date'] = __('Date'); @@ -353,7 +353,7 @@ function wp_manage_posts_columns() { $posts_columns['author'] = __('Author'); $posts_columns['categories'] = __('Categories'); $posts_columns['tags'] = __('Tags'); - if ( !in_array($_GET['post_status'], array('pending', 'draft', 'future')) ) + if ( !isset($_GET['post_status']) || !in_array($_GET['post_status'], array('pending', 'draft', 'future')) ) $posts_columns['comments'] = '
    Comments
    '; $posts_columns['status'] = __('Status'); $posts_columns = apply_filters('manage_posts_columns', $posts_columns); @@ -1092,6 +1092,7 @@ function the_attachment_links( $id = false ) { function wp_dropdown_roles( $default = false ) { global $wp_roles; + $p = ''; $r = ''; foreach( $wp_roles->role_names as $role => $name ) { $name = translate_with_context($name); diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php index 18a77b37fd..0512fd3d69 100644 --- a/wp-admin/includes/theme.php +++ b/wp-admin/includes/theme.php @@ -44,7 +44,7 @@ function get_page_templates() { $description = $description[1]; if ( !empty( $name ) ) { - $page_templates[trim( $name )] = basename( $template ); + $page_templates[trim( $name )] = theme_basename( $template ); } } } diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php index a87535a80a..7efa832afc 100644 --- a/wp-admin/includes/user.php +++ b/wp-admin/includes/user.php @@ -301,6 +301,7 @@ class WP_User_Search { var $total_users_for_query = 0; var $too_many_total_users = false; var $search_errors; + var $paging_text; function WP_User_Search ($search_term = '', $page = '', $role = '') { // constructor $this->search_term = $search_term; diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 0ac94967af..42e6a588e5 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -12,7 +12,7 @@ foreach( array('activate-selected', 'deactivate-selected', 'delete-selected', 'c if( isset($_GET['action']) ) $action = $_GET['action']; -$plugin = $_REQUEST['plugin']; +$plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : ''; if( !empty($action) ) { switch( $action ) { diff --git a/wp-admin/users.php b/wp-admin/users.php index f032e41391..6195872a03 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -8,7 +8,7 @@ if ( !current_user_can('edit_users') ) $title = __('Users'); $parent_file = 'users.php'; -$action = $_REQUEST['action']; +$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : ''; $update = ''; if ( empty($action) ) { @@ -25,6 +25,7 @@ if ( empty($_REQUEST) ) { $referer = ''; } else { $redirect = 'users.php'; + $referer = ''; } switch ($action) { @@ -192,15 +193,19 @@ default: include('admin-header.php'); + $usersearch = isset($_GET['usersearch']) ? $_GET['usersearch'] : null; + $userspage = isset($_GET['userspage']) ? $_GET['userspage'] : null; + $role = isset($_GET['role']) ? $_GET['role'] : null; + // Query the users - $wp_user_search = new WP_User_Search($_GET['usersearch'], $_GET['userspage'], $_GET['role']); + $wp_user_search = new WP_User_Search($usersearch, $userspage, $role); if ( isset($_GET['update']) ) : switch($_GET['update']) { case 'del': case 'del_many': ?> - +

    - +
    'user_login', 'first_name' => 'user_firstname', 'last_name' => 'user_lastname', 'email' => 'user_email', 'url' => 'user_uri', 'role' => 'user_role') as $formpost => $var ) { - $var = 'new_' . $var; - $$var = attribute_escape(stripslashes($_REQUEST[$formpost])); - } - unset($name); + foreach ( array('user_login' => 'user_login', 'first_name' => 'user_firstname', 'last_name' => 'user_lastname', 'email' => 'user_email', 'url' => 'user_uri', 'role' => 'user_role') as $formpost => $var ) { + $var = 'new_' . $var; + $$var = isset($_REQUEST[$formpost]) ? attribute_escape(stripslashes($_REQUEST[$formpost])) : ''; } + unset($name); ?>
    @@ -384,7 +387,7 @@ foreach ( $wp_user_search->get_results() as $userid ) {

    - +
    get_error_messages() as $message ) diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php index ffbfac7da9..428ec6f4ac 100644 --- a/wp-includes/capabilities.php +++ b/wp-includes/capabilities.php @@ -137,6 +137,9 @@ class WP_User { var $cap_key; var $roles = array(); var $allcaps = array(); + + var $first_name = ''; + var $last_name = ''; function WP_User( $id, $name = '' ) { diff --git a/wp-includes/classes.php b/wp-includes/classes.php index b69b9430f8..fccc25a870 100644 --- a/wp-includes/classes.php +++ b/wp-includes/classes.php @@ -110,7 +110,8 @@ class WP { $query = preg_replace("!^.+\?!", '', $query); // Substitute the substring matches into the query. - eval("\$query = \"" . addslashes($query) . "\";"); + eval("@\$query = \"" . addslashes($query) . "\";"); + $this->matched_query = $query; // Parse the query. diff --git a/wp-includes/post.php b/wp-includes/post.php index 4dc60e9694..748dfdc1df 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -1935,6 +1935,7 @@ function get_page_by_path($page_path, $output = OBJECT) { $page_paths = '/' . trim($page_path, '/'); $leaf_path = sanitize_title(basename($page_paths)); $page_paths = explode('/', $page_paths); + $full_path = ''; foreach( (array) $page_paths as $pathdir) $full_path .= ($pathdir!=''?'/':'') . sanitize_title($pathdir); diff --git a/wp-includes/query.php b/wp-includes/query.php index ed614dba27..55bb79ac2d 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -686,7 +686,7 @@ class WP_Query { if ( empty($qv['taxonomy']) || empty($qv['term']) ) { $this->is_tax = false; foreach ( $GLOBALS['wp_taxonomies'] as $t ) { - if ( isset($t->query_var) && '' != $qv[$t->query_var] ) { + if ( isset($t->query_var) && isset($qv[$t->query_var]) && '' != $qv[$t->query_var] ) { $this->is_tax = true; break; } diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 3e994b9551..684d5aa376 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -297,11 +297,15 @@ function get_objects_in_term( $terms, $taxonomies, $args = array() ) { function &get_term($term, $taxonomy, $output = OBJECT, $filter = 'raw') { global $wpdb; - if ( empty($term) ) - return null; + if ( empty($term) ) { + $error = new WP_Error('invalid_term', __('Empty Term')); + return $error; + } - if ( ! is_taxonomy($taxonomy) ) - return new WP_Error('invalid_taxonomy', __('Invalid Taxonomy')); + if ( ! is_taxonomy($taxonomy) ) { + $error = new WP_Error('invalid_taxonomy', __('Invalid Taxonomy')); + return $error; + } if ( is_object($term) ) { wp_cache_add($term->term_id, $term, $taxonomy);