From b658e546840b8f23e2a1e413f6510104d73ea91f Mon Sep 17 00:00:00 2001 From: donncha Date: Mon, 10 Sep 2007 18:26:30 +0000 Subject: Sync with WP 2.2.3 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1051 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-admin/admin-ajax.php | 2 +- wp-admin/admin-functions.php | 6 +- wp-admin/install-rtl.css | 14 ++- wp-admin/options.php | 74 --------------- wp-admin/rtl.css | 186 +++++++++++++++++++++++-------------- wp-admin/widgets-rtl.css | 5 +- wp-includes/default-filters.php | 4 +- wp-includes/feed-rss2-comments.php | 6 +- wp-includes/formatting.php | 75 ++++++++++++++- wp-includes/pluggable.php | 18 +++- wp-includes/plugin.php | 36 ++++++- wp-includes/query.php | 21 ++--- wp-includes/rewrite.php | 9 ++ wp-includes/rss.php | 4 +- wp-includes/vars.php | 23 +++-- wp-includes/version.php | 4 +- wp-includes/widgets.php | 4 +- wp-mail.php | 20 ++-- xmlrpc.php | 4 +- 19 files changed, 314 insertions(+), 201 deletions(-) diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index ad5064f..1bd5480 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -286,7 +286,7 @@ case 'autosave-generate-nonces' : die(wp_create_nonce('update-page_' . $ID)); } } - die($_POST['post_type']); + die('0'); break; default : do_action( 'wp_ajax_' . $_POST['action'] ); diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 37daf60..cb53fd3 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -105,6 +105,8 @@ function wp_write_post() { $_POST['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss ); $_POST['post_date_gmt'] = get_gmt_from_date( $_POST['post_date'] ); } + + unset($_POST['no_filter']); // Create the post. $post_ID = wp_insert_post( $_POST ); @@ -283,6 +285,8 @@ function edit_post() { delete_meta( $key ); } + unset($_POST['no_filter']); + add_meta( $post_ID ); wp_update_post( $_POST ); @@ -2381,4 +2385,4 @@ The Webmaster"); } add_action('update_option_new_admin_email', 'update_option_new_admin_email', 10, 2); -?> \ No newline at end of file +?> diff --git a/wp-admin/install-rtl.css b/wp-admin/install-rtl.css index 6cf6b34..9ab4a20 100644 --- a/wp-admin/install-rtl.css +++ b/wp-admin/install-rtl.css @@ -1,5 +1,15 @@ -body { font-family: Tahoma, Georgia, "Times New Roman", Times, serif; } +body { font: 13px Tahoma, Georgia, "Times New Roman", Times, serif; } ul, ol { padding: 5px 20px 5px 5px; } -.step, th { text-align: left; } +h1, h2, h3 { font-family: "Times New Roman", Times, serif; font-weight: 700 } + +.step, th { text-align: left } + +input { font-family: "Times New Roman", Times, serif; padding: 1px } + +#logo { background: url(../wp-content/plugins/WP-Jalali/wp-fa-logo.png) center right no-repeat; text-align: left; } + +#admin_email {direction: ltr; text-align: left; } + +#footer { font-style: normal; } diff --git a/wp-admin/options.php b/wp-admin/options.php index 466c8be..baccbe3 100644 --- a/wp-admin/options.php +++ b/wp-admin/options.php @@ -23,80 +23,6 @@ if( $_GET[ 'adminhash' ] ) { exit; } } - -function sanitize_option($option, $value) { // Remember to call stripslashes! - - switch ($option) { - case 'admin_email': - case 'new_admin_email': - $value = stripslashes($value); - $value = sanitize_email($value); - break; - - case 'default_post_edit_rows': - case 'mailserver_port': - case 'comment_max_links': - $value = stripslashes($value); - $value = abs((int) $value); - break; - - case 'posts_per_page': - case 'posts_per_rss': - $value = stripslashes($value); - $value = (int) $value; - if ( empty($value) ) $value = 1; - if ( $value < -1 ) $value = abs($value); - break; - - case 'default_ping_status': - case 'default_comment_status': - $value = stripslashes($value); - // Options that if not there have 0 value but need to be something like "closed" - if ( $value == '0' || $value == '') - $value = 'closed'; - break; - - case 'blogdescription': - case 'blogname': - if (current_user_can('unfiltered_html') == false) - $value = wp_filter_post_kses( $value ); // calls stripslashes then addslashes - $value = stripslashes($value); - $value = wp_specialchars( $value ); - break; - - case 'blog_charset': - $value = preg_replace('/[^a-zA-Z0-9_-]/', '', $value); // strips slashes - break; - - case 'date_format': - case 'time_format': - case 'mailserver_url': - case 'mailserver_login': - case 'mailserver_pass': - case 'ping_sites': - case 'upload_path': - $value = strip_tags($value); - $value = wp_filter_kses($value); // calls stripslashes then addslashes - $value = stripslashes($value); - break; - - case 'gmt_offset': - $value = preg_replace('/[^0-9:.-]/', '', $value); // strips slashes - break; - - case 'siteurl': - case 'home': - $value = stripslashes($value); - $value = clean_url($value); - break; - default : - $value = stripslashes($value); - break; - } - - return $value; -} - switch($action) { case 'update': diff --git a/wp-admin/rtl.css b/wp-admin/rtl.css index 2a83e48..ebb6206 100644 --- a/wp-admin/rtl.css +++ b/wp-admin/rtl.css @@ -1,205 +1,247 @@ -#viewarc, #viewcat, #namediv, #emaildiv, #uridiv, #planetnews li, #login ul li, #your-profile fieldset, - #footer .logo, .alignleft .available-theme { float: right; } +#viewarc, #viewcat, #namediv, #emaildiv, #uridiv, #planetnews li, #login ul li, #your-profile fieldset, #footer .logo, .alignleft .available-theme { + float: right; + } -#templateside, .alignright { float: left; } +#templateside, .alignright { + float: left; + } -#login #send, .readmore, .widefat th { text-align: right; } +#login #send, .readmore, .widefat th { + text-align: right; + } -#postcustomsubmit, form#upload th, .submit, .editform th { text-align: left; } +#postcustomsubmit, form#upload th, .submit, .editform th { + text-align: left; + } -#devnews h4, #wphead h1, #your-profile legend, fieldset.options legend, - #planetnews li .post { font-family: Tahoma, Georgia, "Times New Roman", Times, serif; } +#devnews h4, #wphead h1, #your-profile legend, fieldset.options legend, #planetnews li .post { + font-family: Tahoma, Georgia, "Times New Roman", Times, serif; + } -#wphead { padding: .8em 2em .8em 19em; } +#wphead { + padding: .8em 2em .8em 19em; + } -#wphead h1 { font-size: 2.4em; } +#wphead h1 { + font-size: 2.4em; + } -#postdiv, #titlediv, #guiddiv, #tagdiv { margin: 0 0 0 8px; } +#postdiv, #titlediv, #guiddiv, #tagdiv { + margin: 0 0 0 8px; + } -#ed_toolbar input { margin: 3px 0 2px 2px; } +#ed_toolbar input { + margin: 3px 0 2px 2px; + } -#edButtons input, #edButtons input:active { margin: 0px 0 -1px 2px; } +#edButtons input, #edButtons input:active { + margin: 0px 0 -1px 2px; + } -body, td { font: 13px Tahoma, "Lucida Grande", "Lucida Sans Unicode", Verdana; } +body, td { + font: 13px Tahoma, "Lucida Grande", "Lucida Sans Unicode", Verdana; + } -h2 { font: normal 32px/5px serif; } +h1, h2, h3, h4, h5 { + font-family: "Times New Roman", Times, serif; + } +h3.dbx-handle { + font-family: tahoma, Verdana, Arial, Helvetica, sans-serif; + } -textarea, input, select { font: 13px Tahoma, Verdana, Arial, Helvetica, sans-serif; } +textarea, input, select { + font: 13px Tahoma, Verdana, Arial, Helvetica, sans-serif; + } -.quicktags, .search { font: 12px Tahoma, Georgia, "Times New Roman", Times, serif; } +.quicktags, .search { + font: 12px Tahoma, Georgia, "Times New Roman", Times, serif; + } -.updated, .confirm { padding: 0 3em 0 1em; } +.updated, .confirm { + padding: 0 3em 0 1em; + } .submit input, .submit input:focus, .button, .button:focus { border-left-color: #999; border-right-color: #ccc; -} + } .submit input:active, .button:active { border-left-color: #ccc; border-right-color: #999; -} + } #adminmenu { padding: .2em 2em .3em .2em; height: 28px; -} - -#adminmenu li { line-height: 160%; } + } #adminmenu a { margin: 0 0 0 10px; display: block; float: right; -} + font: 700 16px/130% "Times New Roman", Times, serif; + } #adminmenu a.current { border-right: 0; border-left: 2px solid #4f96c8; -} + } -#submenu, #minisub { padding: 1px 3em 0 2em; } +#submenu, #minisub { + padding: 1px 3em 0 2em; + } -#submenu { height: 28px; } - -#submenu li { line-height: 160%; } +#submenu { + height: 28px; + } #submenu a { margin: 0 0 0 10px; display: block; float: right; -} + line-height: 155%; + } #submenu .current { border-right: 0; border-left: 2px solid #045290; -} + } #currenttheme img { float: right; margin-right: auto; margin-left: 1em; -} + } #postdiv #quicktags { padding-right: 0; padding-left: 6px; -} + } .readmore { margin-right: auto; margin-left: 5em; -} + } #postexcerpt div, #attachmentlinks div { margin-right: auto; margin-left: 8px; -} + } * html #postexcerpt .dbx-toggle-open { padding-right: 0; padding-left: 8px; -} + } #searchform { float: right; margin-right: auto; margin-left: 1em; -} + } #poststuff { margin-right: auto; margin-left: 16em; -} + } #template div { margin-right: auto; margin-left: 190px; -} + } * html #template div { margin-right: auto; margin-left: 0px; -} + } #user_info { right: auto; left: 1em; -} - + } + #zeitgeist { float: left; margin-left: auto; margin-right: 1em; -} + } #zeitgeist ul { margin: 0 .6em .3em 0; padding: 0 .6em 0 0; -} + } + +.wrap ul { + margin-left: 500px; + } #categorydiv ul { margin-left: auto; margin-right: 10px; -} - -#moremeta fieldset div { margin: 2px 0px 0 0; } + } #moremeta { - margin-right: auto; + margin-right: 0; margin-left: 15px; right: auto; - left: 5%; -} - + left: 6%; + } + #moremeta .dbx-content { background: url(images/box-butt.gif) no-repeat bottom left; - padding-right: 0; - padding-left: 2px; -} - -#moremeta .dbx-handle { background: #2685af url(images/box-head.gif) no-repeat left; } - -#moremeta .dbx-box { background: url(images/box-bg.gif) repeat-y left; } + padding-right: 10px; + padding-left: 0; + text-align: right; + } + +#moremeta .dbx-handle { + background: #2685af url(images/box-head.gif) no-repeat left; + margin-top: -2px; + } + +#moremeta .dbx-box { + background: url(images/box-bg.gif) repeat-y left; + padding-bottom: 0; + } a.dbx-toggle, a.dbx-toggle:visited { right: auto; left: 2px; -} - -#advancedstuff a.dbx-toggle, #advancedstuff a.dbx-toggle-open:visited { - right: auto; - left: 5px; -} + } -#advancedstuff a.dbx-toggle-open, #advancedstuff a.dbx-toggle-open:visited { - right: auto; - left: 5px; -} #categorychecklist { margin-right: auto; margin-left: 6px; -} + } #ajax-response.alignleft { margin-left: auto; margin-right: 2em; -} + } #postdivrich #edButtons { padding-left: 0; padding-right: 3px; -} + } .page-numbers { margin-right: auto; margin-left: 3px; -} + } a.view-link { right:auto; left:5%; margin-right:0; margin-left:220px; -} + } +#advancedstuff { + direction: ltr; + } +#advancedstuff .dbx-handle { + text-align: right; + } +#advancedstuff .dbx-content * { + direction: rtl; + } diff --git a/wp-admin/widgets-rtl.css b/wp-admin/widgets-rtl.css index 805f39d..a399bae 100644 --- a/wp-admin/widgets-rtl.css +++ b/wp-admin/widgets-rtl.css @@ -4,7 +4,8 @@ * html #palettediv ul { padding: 0 10px 0 0; } -#palettediv ul { padding: 0 10px 0 0; } +#palettediv ul { padding: 0 10px 0 0; + margin-left: 1px!important;} * .handle, #lastmodule span { border-right: 1px solid #f2f2f2; @@ -36,4 +37,4 @@ #shadow { left: auto; right: 0px; -} \ No newline at end of file +} diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php index 0861361..1613b33 100644 --- a/wp-includes/default-filters.php +++ b/wp-includes/default-filters.php @@ -129,6 +129,8 @@ add_filter('get_the_excerpt', 'wp_trim_excerpt'); add_filter('sanitize_title', 'sanitize_title_with_dashes'); +add_filter('wp_title', 'wp_specialchars'); + // RSS filters add_filter('the_title_rss', 'strip_tags'); add_filter('the_title_rss', 'ent2ncr', 8); @@ -176,4 +178,4 @@ add_action('init', 'smilies_init', 5); add_action( 'plugins_loaded', 'wp_maybe_load_widgets', 0 ); add_action( 'shutdown', 'wp_ob_end_flush_all', 1); -?> \ No newline at end of file +?> diff --git a/wp-includes/feed-rss2-comments.php b/wp-includes/feed-rss2-comments.php index 50f5e3d..adb2930 100644 --- a/wp-includes/feed-rss2-comments.php +++ b/wp-includes/feed-rss2-comments.php @@ -5,7 +5,9 @@ echo ''; ?> + xmlns:content="http://purl.org/rss/1.0/modules/content/" + xmlns:dc="http://purl.org/dc/elements/1.1/" + > <?php if ( is_singular() ) @@ -37,7 +39,7 @@ if ( have_comments() ) : while ( have_comments() ) : the_comment(); } ?> - + post_password) && $_COOKIE['wp-postpass'] != $comment_post->post_password) : ?> diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index b251b6e..cb8b372 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -11,7 +11,7 @@ function wptexturize($text) { // if a plugin has provided an autocorrect array, use it if ( isset($wp_cockneyreplace) ) { $cockney = array_keys($wp_cockneyreplace); - $cockney_replace = array_values($wp_cockneyreplace); + $cockneyreplace = array_values($wp_cockneyreplace); } else { $cockney = array("'tain't","'twere","'twas","'tis","'twill","'til","'bout","'nuff","'round","'cause"); $cockneyreplace = array("’tain’t","’twere","’twas","’tis","’twill","’til","’bout","’nuff","’round","’cause"); @@ -1118,6 +1118,79 @@ function wp_make_link_relative( $link ) { return preg_replace('|https?://[^/]+(/.*)|i', '$1', $link ); } +function sanitize_option($option, $value) { // Remember to call stripslashes! + + switch ($option) { + case 'admin_email': + $value = sanitize_email($value); + break; + + case 'default_post_edit_rows': + case 'mailserver_port': + case 'comment_max_links': + case 'page_on_front': + case 'rss_excerpt_length': + case 'default_category': + case 'default_email_category': + case 'default_link_category': + $value = abs((int) $value); + break; + + case 'posts_per_page': + case 'posts_per_rss': + $value = (int) $value; + if ( empty($value) ) $value = 1; + if ( $value < -1 ) $value = abs($value); + break; + + case 'default_ping_status': + case 'default_comment_status': + // Options that if not there have 0 value but need to be something like "closed" + if ( $value == '0' || $value == '') + $value = 'closed'; + break; + + case 'blogdescription': + case 'blogname': + $value = addslashes($value); + $value = wp_filter_post_kses( $value ); // calls stripslashes then addslashes + $value = stripslashes($value); + $value = wp_specialchars( $value ); + break; + + case 'blog_charset': + $value = preg_replace('/[^a-zA-Z0-9_-]/', '', $value); // strips slashes + break; + + case 'date_format': + case 'time_format': + case 'mailserver_url': + case 'mailserver_login': + case 'mailserver_pass': + case 'ping_sites': + case 'upload_path': + $value = strip_tags($value); + $value = addslashes($value); + $value = wp_filter_kses($value); // calls stripslashes then addslashes + $value = stripslashes($value); + break; + + case 'gmt_offset': + $value = preg_replace('/[^0-9:.-]/', '', $value); // strips slashes + break; + + case 'siteurl': + case 'home': + $value = stripslashes($value); + $value = clean_url($value); + break; + default : + break; + } + + return $value; +} + function wp_parse_str( $string, &$array ) { parse_str( $string, $array ); if ( get_magic_quotes_gpc() ) diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index 3668635..3774f50 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -327,8 +327,18 @@ function wp_redirect($location, $status = 302) { $location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%]|i', '', $location); $location = wp_kses_no_null($location); + // remove %0d and %0a from location $strip = array('%0d', '%0a'); - $location = str_replace($strip, '', $location); + $found = true; + while($found) { + $found = false; + foreach($strip as $val) { + while(strpos($location, $val) !== false) { + $found = true; + $location = str_replace($val, '', $location); + } + } + } if ( $is_IIS ) { header("Refresh: 0;url=$location"); @@ -436,14 +446,14 @@ function wp_notify_postauthor($comment_id, $comment_type='') { $notify_message .= sprintf( __('Delete it: %s'), get_option('siteurl')."/wp-admin/comment.php?action=cdc&c=$comment_id" ) . "\r\n"; $notify_message .= sprintf( __('Spam it: %s'), get_option('siteurl')."/wp-admin/comment.php?action=cdc&dt=spam&c=$comment_id" ) . "\r\n"; - $admin_email = get_option('admin_email'); + $wp_email = get_option('admin_email'); if ( '' == $comment->comment_author ) { - $from = "From: \"$blogname\" <$admin_email>"; + $from = "From: \"$blogname\" <$wp_email>"; if ( '' != $comment->comment_author_email ) $reply_to = "Reply-To: $comment->comment_author_email"; } else { - $from = "From: \"$comment->comment_author\" <$admin_email>"; + $from = "From: \"$comment->comment_author\" <$wp_email>"; if ( '' != $comment->comment_author_email ) $reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>"; } diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php index c573ec1..050c544 100644 --- a/wp-includes/plugin.php +++ b/wp-includes/plugin.php @@ -19,7 +19,7 @@ function add_filter($tag, $function_to_add, $priority = 10, $accepted_args = 1) global $wp_filter, $merged_filters; // So the format is wp_filter['tag']['array of priorities']['array of functions serialized']['array of ['array (functions, accepted_args)]'] - $wp_filter[$tag][$priority][serialize($function_to_add)] = array('function' => $function_to_add, 'accepted_args' => $accepted_args); + $wp_filter[$tag][$priority][_wp_filter_build_unique_id($tag, $function_to_add, $priority)] = array('function' => $function_to_add, 'accepted_args' => $accepted_args); unset( $merged_filters[ $tag ] ); return true; } @@ -98,8 +98,8 @@ function merge_filters($tag) { */ function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args = 1) { global $wp_filter, $merged_filters; - - unset($GLOBALS['wp_filter'][$tag][$priority][serialize($function_to_remove)]); + + unset($GLOBALS['wp_filter'][$tag][$priority][_wp_filter_build_unique_id($tag, $function_to_remove, $priority)]); unset( $merged_filters[ $tag ] ); return true; @@ -235,8 +235,9 @@ function remove_action($tag, $function_to_remove, $priority = 10, $accepted_args * @return string The name of a plugin. */ function plugin_basename($file) { - $file = preg_replace('|\\\\+|', '\\\\', $file); - $file = preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', $file); + $file = str_replace('\\','/',$file); // sanitize for Win32 installs + $file = preg_replace('|/+|','/', $file); // remove any duplicate slash + $file = preg_replace('|^.*/wp-content/plugins/|','',$file); // get relative path from plugins dir return $file; } @@ -278,4 +279,29 @@ function register_deactivation_hook($file, $function) { add_action('deactivate_' . $file, $function); } +function _wp_filter_build_unique_id($tag, $function, $priority = 10) +{ + global $wp_filter; + + // If function then just skip all of the tests and not overwrite the following. + if( is_string($function) ) + return $function; + // Object Class Calling + else if(is_object($function[0]) ) + { + $obj_idx = get_class($function[0]).$function[1]; + if( is_null($function[0]->wp_filter_id) ) { + $count = count((array)$wp_filter[$tag][$priority]); + $function[0]->wp_filter_id = $count; + $obj_idx .= $count; + unset($count); + } else + $obj_idx .= $function[0]->wp_filter_id; + return $obj_idx; + } + // Static Calling + else if( is_string($function[0]) ) + return $function[0].$function[1]; +} + ?> diff --git a/wp-includes/query.php b/wp-includes/query.php index 05dc692..a079211 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -413,18 +413,8 @@ class WP_Query { $this->query_vars = $this->fill_query_vars($this->query_vars); $qv = &$this->query_vars; - if ( ! empty($qv['robots']) ) { + if ( ! empty($qv['robots']) ) $this->is_robots = true; - return; - } - - if ('404' == $qv['error']) { - $this->is_404 = true; - if ( !empty($query) ) { - do_action_ref_array('parse_query', array(&$this)); - } - return; - } $qv['p'] = (int) $qv['p']; $qv['page_id'] = (int) $qv['page_id']; @@ -606,12 +596,21 @@ class WP_Query { } } + if ( !empty($qv['post_type']) ) + $qv['post_type'] = sanitize_user($qv['post_type'], true); + + if ( !empty($qv['post_status']) ) + $qv['post_status'] = sanitize_user($qv['post_status'], true); + if ( $this->is_posts_page && !$qv['withcomments'] ) $this->is_comment_feed = false; $this->is_singular = $this->is_single || $this->is_page || $this->is_attachment; // Done correcting is_* for page_on_front and page_for_posts + if ('404' == $qv['error']) + $this->set_404(); + if ( !empty($query) ) do_action_ref_array('parse_query', array(&$this)); } diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php index 2f440ab..19d5224 100644 --- a/wp-includes/rewrite.php +++ b/wp-includes/rewrite.php @@ -135,6 +135,15 @@ function url_to_postid($url) { // Substitute the substring matches into the query. eval("\$query = \"$query\";"); + // Filter out non-public query vars + global $wp; + parse_str($query, $query_vars); + $query = array(); + foreach ( $query_vars as $key => $value ) { + if ( in_array($key, $wp->public_query_vars) ) + $query[$key] = $value; + } + // Do the query $query = new WP_Query($query); if ( $query->is_single || $query->is_page ) return $query->post->ID; diff --git a/wp-includes/rss.php b/wp-includes/rss.php index 44005a7..72b7bb1 100644 --- a/wp-includes/rss.php +++ b/wp-includes/rss.php @@ -9,7 +9,7 @@ define('RSS', 'RSS'); define('ATOM', 'Atom'); -define('MAGPIE_USER_AGENT', 'WordPressMU/' . $wp_version); +define('MAGPIE_USER_AGENT', 'WordPressMU/' . $GLOBALS['wp_version']); class MagpieRSS { var $parser; @@ -591,7 +591,7 @@ function init () { } if ( !defined('MAGPIE_USER_AGENT') ) { - $ua = 'WordPress/' . $wp_version; + $ua = 'WordPress/' . $GLOBALS['wp_version']; if ( MAGPIE_CACHE_ON ) { $ua = $ua . ')'; diff --git a/wp-includes/vars.php b/wp-includes/vars.php index 0f749be..a8b4897 100644 --- a/wp-includes/vars.php +++ b/wp-includes/vars.php @@ -1,15 +1,24 @@ diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php index 52f0a0e..b2ec69e 100644 --- a/wp-includes/widgets.php +++ b/wp-includes/widgets.php @@ -332,13 +332,13 @@ function wp_widget_pages( $args ) { $title = empty( $options['title'] ) ? __( 'Pages' ) : $options['title']; $sortby = empty( $options['sortby'] ) ? 'menu_order' : $options['sortby']; - $exclude = empty( $options['exclude'] ) ? '' : '&exclude=' . $options['exclude']; + $exclude = empty( $options['exclude'] ) ? '' : $options['exclude']; if ( $sortby == 'menu_order' ) { $sortby = 'menu_order, post_title'; } - $out = wp_list_pages( 'title_li=&echo=0&sort_column=' . $sortby . $exclude ); + $out = wp_list_pages( array('title_li' => '', 'echo' => 0, 'sort_column' => $sortby, 'exclude' => $exclude) ); if ( !empty( $out ) ) { ?> diff --git a/wp-mail.php b/wp-mail.php index 8795c74..ebe81bd 100644 --- a/wp-mail.php +++ b/wp-mail.php @@ -64,17 +64,17 @@ for ($i=1; $i <= $count; $i++) : // otherwise use the site admin if (preg_match('/From: /', $line) | preg_match('/Reply-To: /', $line)) { $author=trim($line); - if ( ereg("([a-zA-Z0-9\_\-\.]+@[\a-zA-z0-9\_\-\.]+)", $author , $regs) ) { - $author = $regs[1]; - echo "Author = {$author}

"; - $author = $wpdb->escape($author); - $result = $wpdb->get_row("SELECT ID FROM $wpdb->users WHERE user_email='$author' LIMIT 1"); - if (!$result) + if ( ereg("([a-zA-Z0-9\_\-\.]+@[\a-zA-z0-9\_\-\.]+)", $author , $regs) ) { + $author = $regs[1]; + echo "Author = {$author}

"; + $author = $wpdb->escape($author); + $result = $wpdb->get_row("SELECT ID FROM $wpdb->users WHERE user_email='$author' LIMIT 1"); + if (!$result) + $post_author = 1; + else + $post_author = $result->ID; + } else $post_author = 1; - else - $post_author = $result->ID; - } else - $post_author = 1; } if (preg_match('/Date: /i', $line)) { // of the form '20 Mar 2002 20:32:37' diff --git a/xmlrpc.php b/xmlrpc.php index a235e06..9989a40 100644 --- a/xmlrpc.php +++ b/xmlrpc.php @@ -1046,7 +1046,7 @@ class wp_xmlrpc_server extends IXR_Server { if(isset($content_struct["mt_allow_pings"])) { if(!is_numeric($content_struct["mt_allow_pings"])) { - switch($content["mt_allow_pings"]) { + switch($content_struct["mt_allow_pings"]) { case "closed": $ping_status = "closed"; break; @@ -1258,7 +1258,7 @@ class wp_xmlrpc_server extends IXR_Server { if(isset($content_struct["mt_allow_pings"])) { if(!is_numeric($content_struct["mt_allow_pings"])) { - switch($content["mt_allow_pings"]) { + switch($content_struct["mt_allow_pings"]) { case "closed": $ping_status = "closed"; break; -- cgit