Index: src/index.php =================================================================== --- src/index.php (revision 40901) +++ src/index.php (working copy) @@ -11,7 +11,7 @@ * * @var bool */ -define('WP_USE_THEMES', true); +define( 'WP_USE_THEMES', true ); /** Loads the WordPress Environment and Template */ require( dirname( __FILE__ ) . '/wp-blog-header.php' ); Index: src/wp-activate.php =================================================================== --- src/wp-activate.php (revision 40901) +++ src/wp-activate.php (working copy) @@ -9,17 +9,18 @@ define( 'WP_INSTALLING', true ); /** Sets up the WordPress Environment. */ -require( dirname(__FILE__) . '/wp-load.php' ); +require( dirname( __FILE__ ) . '/wp-load.php' ); require( dirname( __FILE__ ) . '/wp-blog-header.php' ); -if ( !is_multisite() ) { +if ( ! is_multisite() ) { wp_redirect( wp_registration_url() ); die(); } -if ( is_object( $wp_object_cache ) ) +if ( is_object( $wp_object_cache ) ) { $wp_object_cache->cache_enabled = false; +} // Fix for page title $wp_query->is_404 = false; @@ -43,10 +44,10 @@ * Fires before the Site Activation page is loaded. * * Fires on the {@see 'wp_head'} action. - * - * @since 3.0.0 - */ - do_action( 'activate_wp_head' ); + * + * @since 3.0.0 + */ + do_action( 'activate_wp_head' ); } add_action( 'wp_head', 'do_activate_header' ); @@ -73,28 +74,28 @@
- + -

-
+

+

- -
+ +

- +

get_error_code() || 'blog_taken' == $result->get_error_code() ) { - $signup = $result->get_error_data(); - ?> -

+ if ( is_wp_error( $result ) ) { + if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) { + $signup = $result->get_error_data(); + ?> +

'; if ( $signup->domain . $signup->path == '' ) { @@ -118,24 +119,24 @@ ); } echo '

'; - } else { - ?> -

-

get_error_message(); ?>

- -

- -
-

user_login ?>

-

-
+

+

get_error_message(); ?>

+ +

+ +
+

user_login ?>

+

+
- View your site or Log in' ), $url, esc_url( $login_url ) ); ?>

- +

Log in or go back to the homepage.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() ); ?>

Index: src/wp-blog-header.php =================================================================== --- src/wp-blog-header.php (revision 40901) +++ src/wp-blog-header.php (working copy) @@ -5,12 +5,12 @@ * @package WordPress */ -if ( !isset($wp_did_header) ) { +if ( ! isset( $wp_did_header ) ) { $wp_did_header = true; // Load the WordPress library. - require_once( dirname(__FILE__) . '/wp-load.php' ); + require_once( dirname( __FILE__ ) . '/wp-load.php' ); // Set up the WordPress query. wp(); Index: src/wp-comments-post.php =================================================================== --- src/wp-comments-post.php (revision 40901) +++ src/wp-comments-post.php (working copy) @@ -11,14 +11,14 @@ $protocol = 'HTTP/1.0'; } - header('Allow: POST'); - header("$protocol 405 Method Not Allowed"); - header('Content-Type: text/plain'); + header( 'Allow: POST' ); + header( "$protocol 405 Method Not Allowed" ); + header( 'Content-Type: text/plain' ); exit; } /** Sets up the WordPress Environment. */ -require( dirname(__FILE__) . '/wp-load.php' ); +require( dirname( __FILE__ ) . '/wp-load.php' ); nocache_headers(); @@ -26,7 +26,10 @@ if ( is_wp_error( $comment ) ) { $data = intval( $comment->get_error_data() ); if ( ! empty( $data ) ) { - wp_die( '

' . $comment->get_error_message() . '

', __( 'Comment Submission Failure' ), array( 'response' => $data, 'back_link' => true ) ); + wp_die( '

' . $comment->get_error_message() . '

', __( 'Comment Submission Failure' ), array( + 'response' => $data, + 'back_link' => true, + ) ); } else { exit; } Index: src/wp-cron.php =================================================================== --- src/wp-cron.php (revision 40901) +++ src/wp-cron.php (working copy) @@ -9,19 +9,20 @@ * @package WordPress */ -ignore_user_abort(true); +ignore_user_abort( true ); -if ( !empty($_POST) || defined('DOING_AJAX') || defined('DOING_CRON') ) +if ( ! empty( $_POST ) || defined( 'DOING_AJAX' ) || defined( 'DOING_CRON' ) ) { die(); +} /** * Tell WordPress we are doing the CRON task. * * @var bool */ -define('DOING_CRON', true); +define( 'DOING_CRON', true ); -if ( !defined('ABSPATH') ) { +if ( ! defined( 'ABSPATH' ) ) { /** Set up WordPress environment */ require_once( dirname( __FILE__ ) . '/wp-load.php' ); } @@ -48,21 +49,24 @@ $value = wp_cache_get( 'doing_cron', 'transient', true ); } else { $row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", '_transient_doing_cron' ) ); - if ( is_object( $row ) ) + if ( is_object( $row ) ) { $value = $row->option_value; + } } return $value; } -if ( false === $crons = _get_cron_array() ) +if ( false === $crons = _get_cron_array() ) { die(); +} $keys = array_keys( $crons ); $gmt_time = microtime( true ); -if ( isset($keys[0]) && $keys[0] > $gmt_time ) +if ( isset( $keys[0] ) && $keys[0] > $gmt_time ) { die(); +} // The cron lock: a unix timestamp from when the cron was spawned. @@ -70,14 +74,15 @@ // Use global $doing_wp_cron lock otherwise use the GET lock. If no lock, trying grabbing a new lock. if ( empty( $doing_wp_cron ) ) { - if ( empty( $_GET[ 'doing_wp_cron' ] ) ) { + if ( empty( $_GET['doing_wp_cron'] ) ) { // Called from external script/job. Try setting a lock. - if ( $doing_cron_transient && ( $doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $gmt_time ) ) + if ( $doing_cron_transient && ( $doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $gmt_time ) ) { return; + } $doing_cron_transient = $doing_wp_cron = sprintf( '%.22F', microtime( true ) ); set_transient( 'doing_cron', $doing_wp_cron ); } else { - $doing_wp_cron = $_GET[ 'doing_wp_cron' ]; + $doing_wp_cron = $_GET['doing_wp_cron']; } } @@ -85,12 +90,14 @@ * The cron lock (a unix timestamp set when the cron was spawned), * must match $doing_wp_cron (the "key"). */ -if ( $doing_cron_transient != $doing_wp_cron ) +if ( $doing_cron_transient != $doing_wp_cron ) { return; +} foreach ( $crons as $timestamp => $cronhooks ) { - if ( $timestamp > $gmt_time ) + if ( $timestamp > $gmt_time ) { break; + } foreach ( $cronhooks as $hook => $keys ) { @@ -99,8 +106,8 @@ $schedule = $v['schedule']; if ( $schedule != false ) { - $new_args = array($timestamp, $schedule, $hook, $v['args']); - call_user_func_array('wp_reschedule_event', $new_args); + $new_args = array( $timestamp, $schedule, $hook, $v['args'] ); + call_user_func_array( 'wp_reschedule_event', $new_args ); } wp_unschedule_event( $timestamp, $hook, $v['args'] ); @@ -114,16 +121,18 @@ * @param string $hook Name of the hook that was scheduled to be fired. * @param array $args The arguments to be passed to the hook. */ - do_action_ref_array( $hook, $v['args'] ); + do_action_ref_array( $hook, $v['args'] ); // If the hook ran too long and another cron process stole the lock, quit. - if ( _get_cron_lock() != $doing_wp_cron ) + if ( _get_cron_lock() != $doing_wp_cron ) { return; + } } } -} +}// End foreach(). -if ( _get_cron_lock() == $doing_wp_cron ) +if ( _get_cron_lock() == $doing_wp_cron ) { delete_transient( 'doing_cron' ); +} die(); Index: src/wp-links-opml.php =================================================================== --- src/wp-links-opml.php (revision 40901) +++ src/wp-links-opml.php (working copy) @@ -14,23 +14,24 @@ require_once( dirname( __FILE__ ) . '/wp-load.php' ); -header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true); +header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true ); $link_cat = ''; -if ( !empty($_GET['link_cat']) ) { +if ( ! empty( $_GET['link_cat'] ) ) { $link_cat = $_GET['link_cat']; - if ( !in_array($link_cat, array('all', '0')) ) - $link_cat = absint( (string)urldecode($link_cat) ); + if ( ! in_array( $link_cat, array( 'all', '0' ) ) ) { + $link_cat = absint( (string) urldecode( $link_cat ) ); + } } -echo '\n"; +echo '\n"; ?> <?php /* translators: 1: Site name */ - printf( __('Links for %s'), esc_attr(get_bloginfo('name', 'display')) ); + printf( __( 'Links for %s' ), esc_attr( get_bloginfo( 'name', 'display' ) ) ); ?> - GMT + GMT 'link_category', 'hierarchical' => 0)); -else - $cats = get_categories(array('taxonomy' => 'link_category', 'hierarchical' => 0, 'include' => $link_cat)); +if ( empty( $link_cat ) ) { + $cats = get_categories( array( + 'taxonomy' => 'link_category', + 'hierarchical' => 0, + ) ); +} else { $cats = get_categories( array( + 'taxonomy' => 'link_category', + 'hierarchical' => 0, + 'include' => $link_cat, +) ); +} -foreach ( (array)$cats as $cat ) : +foreach ( (array) $cats as $cat ) : /** * Filters the OPML outline link category name. * @@ -58,20 +66,22 @@ $catname = apply_filters( 'link_category', $cat->name ); ?> - + $cat->term_id)); - foreach ( (array)$bookmarks as $bookmark ) : - /** + $bookmarks = get_bookmarks( array( + 'category' => $cat->term_id, + ) ); +foreach ( (array) $bookmarks as $bookmark ) : + /** * Filters the OPML outline link title text. * * @since 2.2.0 * * @param string $title The OPML outline title text. */ - $title = apply_filters( 'link_title', $bookmark->link_name ); + $title = apply_filters( 'link_title', $bookmark->link_name ); ?> - + Index: src/wp-load.php =================================================================== --- src/wp-load.php (revision 40901) +++ src/wp-load.php (working copy) @@ -31,7 +31,7 @@ * * If neither set of conditions is true, initiate loading the setup process. */ -if ( file_exists( ABSPATH . 'wp-config.php') ) { +if ( file_exists( ABSPATH . 'wp-config.php' ) ) { /** The config file resides in ABSPATH */ require_once( ABSPATH . 'wp-config.php' ); @@ -87,7 +87,7 @@ __( "You can create a %s file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ), 'wp-config.php' ) . '

'; - $die .= '

' . __( "Create a Configuration File" ) . ''; + $die .= '

' . __( 'Create a Configuration File' ) . ''; wp_die( $die, __( 'WordPress › Error' ) ); -} +}// End if(). Index: src/wp-login.php =================================================================== --- src/wp-login.php (revision 40901) +++ src/wp-login.php (working copy) @@ -9,11 +9,11 @@ */ /** Make sure that the WordPress bootstrap has run before continuing. */ -require( dirname(__FILE__) . '/wp-load.php' ); +require( dirname( __FILE__ ) . '/wp-load.php' ); // Redirect to https login if forced to use SSL if ( force_ssl_admin() && ! is_ssl() ) { - if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) { + if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) { wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) ); exit(); } else { @@ -38,8 +38,9 @@ add_action( 'login_head', 'wp_login_viewport_meta' ); - if ( empty($wp_error) ) + if ( empty( $wp_error ) ) { $wp_error = new WP_Error(); + } // Shake it! $shake_error_codes = array( 'empty_password', 'empty_email', 'invalid_email', 'invalidcombo', 'empty_username', 'invalid_username', 'incorrect_password' ); @@ -52,8 +53,9 @@ */ $shake_error_codes = apply_filters( 'shake_error_codes', $shake_error_codes ); - if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) + if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) { add_action( 'login_head', 'wp_shake_js', 12 ); + } $separator = is_rtl() ? ' › ' : ' ‹ '; @@ -65,7 +67,7 @@ > - + <?php echo get_bloginfo( 'name', 'display' ) . $separator . $title; ?> add('error', $error); - unset($error); + if ( ! empty( $error ) ) { + $wp_error->add( 'error', $error ); + unset( $error ); } if ( $wp_error->get_error_code() ) { @@ -186,10 +191,10 @@ foreach ( $wp_error->get_error_codes() as $code ) { $severity = $wp_error->get_error_data( $code ); foreach ( $wp_error->get_error_messages( $code ) as $error_message ) { - if ( 'message' == $severity ) + if ( 'message' == $severity ) { $messages .= ' ' . $error_message . "
\n"; - else - $errors .= ' ' . $error_message . "
\n"; + } else { $errors .= ' ' . $error_message . "
\n"; + } } } if ( ! empty( $errors ) ) { @@ -220,11 +225,11 @@ * * @param string $input_id Which input to auto-focus */ -function login_footer($input_id = '') { +function login_footer( $input_id = '' ) { global $interim_login; // Don't allow interim logins to navigate away from the page. - if ( ! $interim_login ): ?> + if ( ! $interim_login ) : ?>

- + - - + ID) && !is_super_admin( $user->ID ) ) - $redirect_to = user_admin_url(); - elseif ( is_multisite() && !$user->has_cap('read') ) - $redirect_to = get_dashboard_url( $user->ID ); - elseif ( !$user->has_cap('edit_posts') ) - $redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url(); + if ( ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) { + // If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile. + if ( is_multisite() && ! get_active_blog_for_user( $user->ID ) && ! is_super_admin( $user->ID ) ) { + $redirect_to = user_admin_url(); + } elseif ( is_multisite() && ! $user->has_cap( 'read' ) ) { + $redirect_to = get_dashboard_url( $user->ID ); + } elseif ( ! $user->has_cap( 'edit_posts' ) ) { + $redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url(); + } - wp_redirect( $redirect_to ); + wp_redirect( $redirect_to ); + exit(); + } + wp_safe_redirect( $redirect_to ); exit(); } - wp_safe_redirect($redirect_to); - exit(); - } - $errors = $user; - // Clear errors if loggedout is set. - if ( !empty($_GET['loggedout']) || $reauth ) - $errors = new WP_Error(); + $errors = $user; + // Clear errors if loggedout is set. + if ( ! empty( $_GET['loggedout'] ) || $reauth ) { + $errors = new WP_Error(); + } - if ( $interim_login ) { - if ( ! $errors->get_error_code() ) - $errors->add( 'expired', __( 'Your session has expired. Please log in to continue where you left off.' ), 'message' ); - } else { - // Some parts of this script use the main login form to display a message - if ( isset($_GET['loggedout']) && true == $_GET['loggedout'] ) - $errors->add('loggedout', __('You are now logged out.'), 'message'); - elseif ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] ) - $errors->add('registerdisabled', __('User registration is currently not allowed.')); - elseif ( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] ) - $errors->add('confirm', __('Check your email for the confirmation link.'), 'message'); - elseif ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] ) - $errors->add('newpass', __('Check your email for your new password.'), 'message'); - elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] ) - $errors->add('registered', __('Registration complete. Please check your email.'), 'message'); - elseif ( strpos( $redirect_to, 'about.php?updated' ) ) - $errors->add('updated', __( 'You have successfully updated WordPress! Please log back in to see what’s new.' ), 'message' ); - } + if ( $interim_login ) { + if ( ! $errors->get_error_code() ) { + $errors->add( 'expired', __( 'Your session has expired. Please log in to continue where you left off.' ), 'message' ); + } + } else { + // Some parts of this script use the main login form to display a message + if ( isset( $_GET['loggedout'] ) && true == $_GET['loggedout'] ) { + $errors->add( 'loggedout', __( 'You are now logged out.' ), 'message' ); + } elseif ( isset( $_GET['registration'] ) && 'disabled' == $_GET['registration'] ) { + $errors->add( 'registerdisabled', __( 'User registration is currently not allowed.' ) ); + } elseif ( isset( $_GET['checkemail'] ) && 'confirm' == $_GET['checkemail'] ) { + $errors->add( 'confirm', __( 'Check your email for the confirmation link.' ), 'message' ); + } elseif ( isset( $_GET['checkemail'] ) && 'newpass' == $_GET['checkemail'] ) { + $errors->add( 'newpass', __( 'Check your email for your new password.' ), 'message' ); + } elseif ( isset( $_GET['checkemail'] ) && 'registered' == $_GET['checkemail'] ) { + $errors->add( 'registered', __( 'Registration complete. Please check your email.' ), 'message' ); + } elseif ( strpos( $redirect_to, 'about.php?updated' ) ) { + $errors->add( 'updated', __( 'You have successfully updated WordPress! Please log back in to see what’s new.' ), 'message' ); + } + } - /** + /** * Filters the login page errors. * * @since 3.6.0 @@ -878,26 +898,28 @@ * @param object $errors WP Error object. * @param string $redirect_to Redirect destination URL. */ - $errors = apply_filters( 'wp_login_errors', $errors, $redirect_to ); + $errors = apply_filters( 'wp_login_errors', $errors, $redirect_to ); - // Clear any stale cookies. - if ( $reauth ) - wp_clear_auth_cookie(); + // Clear any stale cookies. + if ( $reauth ) { + wp_clear_auth_cookie(); + } - login_header(__('Log In'), '', $errors); + login_header( __( 'Log In' ), '', $errors ); - if ( isset($_POST['log']) ) - $user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(wp_unslash($_POST['log'])) : ''; - $rememberme = ! empty( $_POST['rememberme'] ); + if ( isset( $_POST['log'] ) ) { + $user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr( wp_unslash( $_POST['log'] ) ) : ''; + } + $rememberme = ! empty( $_POST['rememberme'] ); - if ( ! empty( $errors->errors ) ) { - $aria_describedby_error = ' aria-describedby="login_error"'; - } else { - $aria_describedby_error = ''; - } -?> + if ( ! empty( $errors->errors ) ) { + $aria_describedby_error = ' aria-describedby="login_error"'; + } else { + $aria_describedby_error = ''; + } + ?> -

+

@@ -916,79 +938,79 @@ ?>

- - + + - - - - + + + + - +

- - - -
- + + + - + } catch(e){} + }()); + + -connect( get_option('mailserver_url'), get_option('mailserver_port') ) || !$pop3->user( get_option('mailserver_login') ) ) +if ( ! $pop3->connect( get_option( 'mailserver_url' ), get_option( 'mailserver_port' ) ) || ! $pop3->user( get_option( 'mailserver_login' ) ) ) { wp_die( esc_html( $pop3->ERROR ) ); +} -$count = $pop3->pass( get_option('mailserver_pass') ); +$count = $pop3->pass( get_option( 'mailserver_pass' ) ); -if( false === $count ) +if ( false === $count ) { wp_die( esc_html( $pop3->ERROR ) ); +} -if( 0 === $count ) { +if ( 0 === $count ) { $pop3->quit(); - wp_die( __('There doesn’t seem to be any new mail.') ); + wp_die( __( 'There doesn’t seem to be any new mail.' ) ); } for ( $i = 1; $i <= $count; $i++ ) { - $message = $pop3->get($i); + $message = $pop3->get( $i ); $bodysignal = false; $boundary = ''; @@ -72,44 +77,45 @@ $content_transfer_encoding = ''; $post_author = 1; $author_found = false; - foreach ($message as $line) { + foreach ( $message as $line ) { // Body signal. - if ( strlen($line) < 3 ) + if ( strlen( $line ) < 3 ) { $bodysignal = true; + } if ( $bodysignal ) { $content .= $line; } else { - if ( preg_match('/Content-Type: /i', $line) ) { - $content_type = trim($line); - $content_type = substr($content_type, 14, strlen($content_type) - 14); - $content_type = explode(';', $content_type); + if ( preg_match( '/Content-Type: /i', $line ) ) { + $content_type = trim( $line ); + $content_type = substr( $content_type, 14, strlen( $content_type ) - 14 ); + $content_type = explode( ';', $content_type ); if ( ! empty( $content_type[1] ) ) { - $charset = explode('=', $content_type[1]); - $charset = ( ! empty( $charset[1] ) ) ? trim($charset[1]) : ''; + $charset = explode( '=', $content_type[1] ); + $charset = ( ! empty( $charset[1] ) ) ? trim( $charset[1] ) : ''; } $content_type = $content_type[0]; } - if ( preg_match('/Content-Transfer-Encoding: /i', $line) ) { - $content_transfer_encoding = trim($line); - $content_transfer_encoding = substr($content_transfer_encoding, 27, strlen($content_transfer_encoding) - 27); - $content_transfer_encoding = explode(';', $content_transfer_encoding); + if ( preg_match( '/Content-Transfer-Encoding: /i', $line ) ) { + $content_transfer_encoding = trim( $line ); + $content_transfer_encoding = substr( $content_transfer_encoding, 27, strlen( $content_transfer_encoding ) - 27 ); + $content_transfer_encoding = explode( ';', $content_transfer_encoding ); $content_transfer_encoding = $content_transfer_encoding[0]; } - if ( ( $content_type == 'multipart/alternative' ) && ( false !== strpos($line, 'boundary="') ) && ( '' == $boundary ) ) { - $boundary = trim($line); - $boundary = explode('"', $boundary); + if ( ( $content_type == 'multipart/alternative' ) && ( false !== strpos( $line, 'boundary="' ) ) && ( '' == $boundary ) ) { + $boundary = trim( $line ); + $boundary = explode( '"', $boundary ); $boundary = $boundary[1]; } - if (preg_match('/Subject: /i', $line)) { - $subject = trim($line); - $subject = substr($subject, 9, strlen($subject) - 9); + if ( preg_match( '/Subject: /i', $line ) ) { + $subject = trim( $line ); + $subject = substr( $subject, 9, strlen( $subject ) - 9 ); // Captures any text in the subject before $phone_delim as the subject - if ( function_exists('iconv_mime_decode') ) { - $subject = iconv_mime_decode($subject, 2, get_option('blog_charset')); + if ( function_exists( 'iconv_mime_decode' ) ) { + $subject = iconv_mime_decode( $subject, 2, get_option( 'blog_charset' ) ); } else { - $subject = wp_iso_descrambler($subject); + $subject = wp_iso_descrambler( $subject ); } - $subject = explode($phone_delim, $subject); + $subject = explode( $phone_delim, $subject ); $subject = $subject[0]; } @@ -118,15 +124,15 @@ * otherwise use the site admin. */ if ( ! $author_found && preg_match( '/^(From|Reply-To): /', $line ) ) { - if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) ) + if ( preg_match( '|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches ) ) { $author = $matches[0]; - else - $author = trim($line); - $author = sanitize_email($author); - if ( is_email($author) ) { + } else { $author = trim( $line ); + } + $author = sanitize_email( $author ); + if ( is_email( $author ) ) { /* translators: Post author email address */ - echo '

' . sprintf(__('Author is %s'), $author) . '

'; - $userdata = get_user_by('email', $author); + echo '

' . sprintf( __( 'Author is %s' ), $author ) . '

'; + $userdata = get_user_by( 'email', $author ); if ( ! empty( $userdata ) ) { $post_author = $userdata->ID; $author_found = true; @@ -141,32 +147,32 @@ $post_date = gmdate( 'Y-m-d H:i:s', $ddate_U + $time_difference ); $post_date_gmt = gmdate( 'Y-m-d H:i:s', $ddate_U ); } - } - } + }// End if(). + }// End foreach(). // Set $post_status based on $author_found and on author's publish_posts capability if ( $author_found ) { - $user = new WP_User($post_author); - $post_status = ( $user->has_cap('publish_posts') ) ? 'publish' : 'pending'; + $user = new WP_User( $post_author ); + $post_status = ( $user->has_cap( 'publish_posts' ) ) ? 'publish' : 'pending'; } else { // Author not found in DB, set status to pending. Author already set to admin. $post_status = 'pending'; } - $subject = trim($subject); + $subject = trim( $subject ); if ( $content_type == 'multipart/alternative' ) { - $content = explode('--'.$boundary, $content); + $content = explode( '--' . $boundary, $content ); $content = $content[2]; // Match case-insensitive content-transfer-encoding. - if ( preg_match( '/Content-Transfer-Encoding: quoted-printable/i', $content, $delim) ) { - $content = explode($delim[0], $content); + if ( preg_match( '/Content-Transfer-Encoding: quoted-printable/i', $content, $delim ) ) { + $content = explode( $delim[0], $content ); $content = $content[1]; } - $content = strip_tags($content, '


'); + $content = strip_tags( $content, '


' ); } - $content = trim($content); + $content = trim( $content ); /** * Filters the original content of the email. @@ -180,19 +186,19 @@ */ $content = apply_filters( 'wp_mail_original_content', $content ); - if ( false !== stripos($content_transfer_encoding, "quoted-printable") ) { - $content = quoted_printable_decode($content); + if ( false !== stripos( $content_transfer_encoding, 'quoted-printable' ) ) { + $content = quoted_printable_decode( $content ); } - if ( function_exists('iconv') && ! empty( $charset ) ) { - $content = iconv($charset, get_option('blog_charset'), $content); + if ( function_exists( 'iconv' ) && ! empty( $charset ) ) { + $content = iconv( $charset, get_option( 'blog_charset' ), $content ); } // Captures any text in the body after $phone_delim as the body - $content = explode($phone_delim, $content); + $content = explode( $phone_delim, $content ); $content = empty( $content[1] ) ? $content[0] : $content[1]; - $content = trim($content); + $content = trim( $content ); /** * Filters the content of the post submitted by email before saving. @@ -203,22 +209,25 @@ */ $post_content = apply_filters( 'phone_content', $content ); - $post_title = xmlrpc_getposttitle($content); + $post_title = xmlrpc_getposttitle( $content ); - if ($post_title == '') $post_title = $subject; + if ( $post_title == '' ) { $post_title = $subject; + } - $post_category = array(get_option('default_email_category')); + $post_category = array( get_option( 'default_email_category' ) ); - $post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status'); - $post_data = wp_slash($post_data); + $post_data = compact( 'post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status' ); + $post_data = wp_slash( $post_data ); - $post_ID = wp_insert_post($post_data); - if ( is_wp_error( $post_ID ) ) + $post_ID = wp_insert_post( $post_data ); + if ( is_wp_error( $post_ID ) ) { echo "\n" . $post_ID->get_error_message(); + } // We couldn't post, for whatever reason. Better move forward to the next email. - if ( empty( $post_ID ) ) + if ( empty( $post_ID ) ) { continue; + } /** * Fires after a post submitted by email is published. @@ -232,7 +241,7 @@ echo "\n

" . __( 'Author:' ) . ' ' . esc_html( $post_author ) . '

'; echo "\n

" . __( 'Posted title:' ) . ' ' . esc_html( $post_title ) . '

'; - if(!$pop3->delete($i)) { + if ( ! $pop3->delete( $i ) ) { echo '

' . sprintf( /* translators: %s: POP3 error */ __( 'Oops: %s' ), @@ -247,7 +256,6 @@ '' . $i . '' ) . '

'; } - -} +}// End for(). $pop3->quit(); Index: src/wp-settings.php =================================================================== --- src/wp-settings.php (revision 40901) +++ src/wp-settings.php (working copy) @@ -128,8 +128,9 @@ register_shutdown_function( 'shutdown_action_hook' ); // Stop most of WordPress from being loaded if we just want the basics. -if ( SHORTINIT ) +if ( SHORTINIT ) { return false; +} // Load the L10n library. require_once( ABSPATH . WPINC . '/l10n.php' ); @@ -277,8 +278,9 @@ */ do_action( 'muplugins_loaded' ); -if ( is_multisite() ) - ms_cookie_constants( ); +if ( is_multisite() ) { + ms_cookie_constants( ); +} // Define constants after multisite is loaded. wp_cookie_constants(); @@ -312,8 +314,9 @@ wp_set_internal_encoding(); // Run wp_cache_postload() if object cache is enabled and the function exists. -if ( WP_CACHE && function_exists( 'wp_cache_postload' ) ) +if ( WP_CACHE && function_exists( 'wp_cache_postload' ) ) { wp_cache_postload(); +} /** * Fires once activated plugins have loaded. @@ -388,15 +391,16 @@ do_action( 'setup_theme' ); // Define the template related constants. -wp_templating_constants( ); +wp_templating_constants( ); // Load the default text localization domain. load_default_textdomain(); $locale = get_locale(); $locale_file = WP_LANG_DIR . "/$locale.php"; -if ( ( 0 === validate_file( $locale ) ) && is_readable( $locale_file ) ) +if ( ( 0 === validate_file( $locale ) ) && is_readable( $locale_file ) ) { require( $locale_file ); +} unset( $locale_file ); /** @@ -418,10 +422,12 @@ // Load the functions for the active theme, for both parent and child theme if applicable. if ( ! wp_installing() || 'wp-activate.php' === $pagenow ) { - if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) ) + if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) ) { include( STYLESHEETPATH . '/functions.php' ); - if ( file_exists( TEMPLATEPATH . '/functions.php' ) ) + } + if ( file_exists( TEMPLATEPATH . '/functions.php' ) ) { include( TEMPLATEPATH . '/functions.php' ); + } } /** @@ -453,7 +459,7 @@ require( $file ); die(); } - unset($file); + unset( $file ); } /** Index: src/wp-signup.php =================================================================== --- src/wp-signup.php (revision 40901) +++ src/wp-signup.php (working copy) @@ -1,13 +1,13 @@ ' . __('Site Name:') . ''; - else - echo ''; + if ( ! is_subdomain_install() ) { + echo ''; + } else { echo ''; + } - if ( $errmsg = $errors->get_error_message('blogname') ) { ?> + if ( $errmsg = $errors->get_error_message( 'blogname' ) ) { ?>

' . $current_network->domain . $current_network->path . '
'; - else - echo '.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_network->domain ) ) . '
'; + if ( ! is_subdomain_install() ) { + echo '' . $current_network->domain . $current_network->path . '
'; + } else { echo '.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_network->domain ) ) . '
'; + } if ( ! is_user_logged_in() ) { if ( ! is_subdomain_install() ) { @@ -129,11 +129,11 @@ // Blog Title ?> - - get_error_message('blog_title') ) { ?> + + get_error_message( 'blog_title' ) ) { ?>

'; + echo ''; ?>
-

- - -
- - -

+

+ + +
+ + +

' . __('Username:') . ''; - if ( $errmsg = $errors->get_error_message('user_name') ) { - echo '

'.$errmsg.'

'; + echo ''; + if ( $errmsg = $errors->get_error_message( 'user_name' ) ) { + echo '

' . $errmsg . '

'; } - echo '
'; + echo '
'; _e( '(Must be at least 4 characters, letters and numbers only.)' ); ?> - get_error_message('user_email') ) { ?> + get_error_message( 'user_email' ) ) { ?>

-
+
get_error_message('generic') ) { + if ( $errmsg = $errors->get_error_message( 'generic' ) ) { echo '

' . $errmsg . '

'; } /** @@ -260,7 +261,7 @@ * @return array Contains username, email, and error messages. */ function validate_user_form() { - return wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']); + return wpmu_validate_user_signup( $_POST['user_name'], $_POST['user_email'] ); } /** @@ -275,14 +276,14 @@ function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) { $current_user = wp_get_current_user(); - if ( ! is_wp_error($errors) ) { + if ( ! is_wp_error( $errors ) ) { $errors = new WP_Error(); } $signup_defaults = array( 'blogname' => $blogname, 'blog_title' => $blog_title, - 'errors' => $errors + 'errors' => $errors, ); /** @@ -313,15 +314,15 @@

add another site to your account. There is no limit to the number of sites you can have, so create to your heart’s content, but write responsibly!' ), $current_user->display_name ) ?>

ID); - if ( !empty($blogs) ) { ?> + $blogs = get_blogs_of_user( $current_user->ID ); + if ( ! empty( $blogs ) ) { ?>

@@ -339,7 +340,7 @@ */ do_action( 'signup_hidden_fields', 'create-another-site' ); ?> - +

get_error_code() ) { - signup_another_blog($blogname, $blog_title, $errors); + signup_another_blog( $blogname, $blog_title, $errors ); return false; } @@ -378,7 +379,7 @@ $blog_meta_defaults = array( 'lang_id' => 1, - 'public' => $public + 'public' => $public, ); // Handle the language setting for the new site. @@ -393,7 +394,6 @@ $blog_meta_defaults['WPLANG'] = $language; } } - } /** @@ -499,10 +499,11 @@ function signup_user( $user_name = '', $user_email = '', $errors = '' ) { global $active_signup; - if ( !is_wp_error($errors) ) + if ( ! is_wp_error( $errors ) ) { $errors = new WP_Error(); + } - $signup_for = isset( $_POST[ 'signup_for' ] ) ? esc_html( $_POST[ 'signup_for' ] ) : 'blog'; + $signup_for = isset( $_POST['signup_for'] ) ? esc_html( $_POST['signup_for'] ) : 'blog'; $signup_user_defaults = array( 'user_name' => $user_name, @@ -540,7 +541,7 @@ /** This action is documented in wp-signup.php */ do_action( 'signup_hidden_fields', 'validate-user' ); ?> - +

@@ -549,14 +550,14 @@ /> - +
/> - +

-

+

get_error_code() ) { - signup_user($user_name, $user_email, $errors); + signup_user( $user_name, $user_email, $errors ); return false; } if ( 'blog' == $_POST['signup_for'] ) { - signup_blog($user_name, $user_email); + signup_blog( $user_name, $user_email ); return false; } /** This filter is documented in wp-signup.php */ wpmu_signup_user( $user_name, $user_email, apply_filters( 'add_signup_meta', array() ) ); - confirm_user_signup($user_name, $user_email); + confirm_user_signup( $user_name, $user_email ); return true; } @@ -599,10 +600,10 @@ * @param string $user_name The username * @param string $user_email The user's email address */ -function confirm_user_signup($user_name, $user_email) { +function confirm_user_signup( $user_name, $user_email ) { ?>

+ printf( __( '%s is your new username' ), $user_name ) ?>

you must activate it.' ) ?>

' . $user_email . '' ); ?>

@@ -623,16 +624,17 @@ * @param string $blog_title The site title. * @param WP_Error|string $errors A WP_Error object containing existing errors. Defaults to empty string. */ -function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = '') { - if ( !is_wp_error($errors) ) +function signup_blog( $user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = '' ) { + if ( ! is_wp_error( $errors ) ) { $errors = new WP_Error(); + } $signup_blog_defaults = array( 'user_name' => $user_name, 'user_email' => $user_email, 'blogname' => $blogname, 'blog_title' => $blog_title, - 'errors' => $errors + 'errors' => $errors, ); /** @@ -658,19 +660,20 @@ $blog_title = $filtered_results['blog_title']; $errors = $filtered_results['errors']; - if ( empty($blogname) ) + if ( empty( $blogname ) ) { $blogname = $user_name; + } ?>
- - + + - -

+ +

get_error_code() ) { - signup_blog($user_name, $user_email, $blogname, $blog_title, $errors); + signup_blog( $user_name, $user_email, $blogname, $blog_title, $errors ); return false; } $public = (int) $_POST['blog_public']; - $signup_meta = array ('lang_id' => 1, 'public' => $public); + $signup_meta = array( + 'lang_id' => 1, + 'public' => $public, + ); // Handle the language setting for the new site. if ( ! empty( $_POST['WPLANG'] ) ) { @@ -721,14 +727,13 @@ $signup_meta['WPLANG'] = $language; } } - } /** This filter is documented in wp-signup.php */ $meta = apply_filters( 'add_signup_meta', $signup_meta ); - wpmu_signup_blog($domain, $path, $blog_title, $user_name, $user_email, $meta); - confirm_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta); + wpmu_signup_blog( $domain, $path, $blog_title, $user_name, $user_email, $meta ); + confirm_blog_signup( $domain, $path, $blog_title, $user_name, $user_email, $meta ); return true; } @@ -843,12 +848,12 @@ echo '
'; } -$newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null; +$newblogname = isset( $_GET['new'] ) ? strtolower( preg_replace( '/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'] ) ) : null; $current_user = wp_get_current_user(); if ( $active_signup == 'none' ) { _e( 'Registration has been disabled.' ); -} elseif ( $active_signup == 'blog' && !is_user_logged_in() ) { +} elseif ( $active_signup == 'blog' && ! is_user_logged_in() ) { $login_url = wp_login_url( network_site_url( 'wp-signup.php' ) ); /* translators: %s: login URL */ printf( __( 'You must first log in, and then you can create a new site.' ), $login_url ); @@ -856,55 +861,56 @@ $stage = isset( $_POST['stage'] ) ? $_POST['stage'] : 'default'; switch ( $stage ) { case 'validate-user-signup' : - if ( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' ) + if ( $active_signup == 'all' || $_POST['signup_for'] == 'blog' && $active_signup == 'blog' || $_POST['signup_for'] == 'user' && $active_signup == 'user' ) { validate_user_signup(); - else - _e( 'User registration has been disabled.' ); + } else { _e( 'User registration has been disabled.' ); + } break; case 'validate-blog-signup': - if ( $active_signup == 'all' || $active_signup == 'blog' ) + if ( $active_signup == 'all' || $active_signup == 'blog' ) { validate_blog_signup(); - else - _e( 'Site registration has been disabled.' ); + } else { _e( 'Site registration has been disabled.' ); + } break; case 'gimmeanotherblog': validate_another_blog_signup(); break; case 'default': default : - $user_email = isset( $_POST[ 'user_email' ] ) ? $_POST[ 'user_email' ] : ''; + $user_email = isset( $_POST['user_email'] ) ? $_POST['user_email'] : ''; /** * Fires when the site sign-up form is sent. * * @since 3.0.0 */ do_action( 'preprocess_signup_form' ); - if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) ) - signup_another_blog($newblogname); - elseif ( ! is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'user' ) ) + if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) ) { + signup_another_blog( $newblogname ); + } elseif ( ! is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'user' ) ) { signup_user( $newblogname, $user_email ); - elseif ( ! is_user_logged_in() && ( $active_signup == 'blog' ) ) + } elseif ( ! is_user_logged_in() && ( $active_signup == 'blog' ) ) { _e( 'Sorry, new registrations are not allowed at this time.' ); - else - _e( 'You are logged in already. No need to register again!' ); + } else { _e( 'You are logged in already. No need to register again!' ); + } if ( $newblogname ) { $newblog = get_blogaddress_by_name( $newblogname ); - if ( $active_signup == 'blog' || $active_signup == 'all' ) + if ( $active_signup == 'blog' || $active_signup == 'all' ) { /* translators: %s: site address */ printf( '

' . __( 'The site you were looking for, %s, does not exist, but you can create it now!' ) . '

', '' . $newblog . '' ); - else - /* translators: %s: site address */ + } else { // End if(). + printf( '

' . __( 'The site you were looking for, %s, does not exist.' ) . '

', '' . $newblog . '' ); + } } break; - } -} + }// End switch(). +}// End if(). ?>
Index: src/wp-trackback.php =================================================================== --- src/wp-trackback.php (revision 40901) +++ src/wp-trackback.php (working copy) @@ -8,9 +8,11 @@ * @subpackage Trackbacks */ -if (empty($wp)) { +if ( empty( $wp ) ) { require_once( dirname( __FILE__ ) . '/wp-load.php' ); - wp( array( 'tb' => '1' ) ); + wp( array( + 'tb' => '1', + ) ); } /** @@ -24,73 +26,76 @@ * Default '0'. Accepts '0' or '1', true or false. * @param string $error_message Error message if an error occurred. */ -function trackback_response($error = 0, $error_message = '') { - header('Content-Type: text/xml; charset=' . get_option('blog_charset') ); - if ($error) { - echo '\n"; +function trackback_response( $error = 0, $error_message = '' ) { + header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) ); + if ( $error ) { + echo '\n"; echo "\n"; echo "1\n"; echo "$error_message\n"; - echo ""; + echo ''; die(); } else { - echo '\n"; + echo '\n"; echo "\n"; echo "0\n"; - echo ""; + echo ''; } } // Trackback is done by a POST. $request_array = 'HTTP_POST_VARS'; -if ( !isset($_GET['tb_id']) || !$_GET['tb_id'] ) { - $tb_id = explode('/', $_SERVER['REQUEST_URI']); - $tb_id = intval( $tb_id[ count($tb_id) - 1 ] ); +if ( ! isset( $_GET['tb_id'] ) || ! $_GET['tb_id'] ) { + $tb_id = explode( '/', $_SERVER['REQUEST_URI'] ); + $tb_id = intval( $tb_id[ count( $tb_id ) - 1 ] ); } -$tb_url = isset($_POST['url']) ? $_POST['url'] : ''; -$charset = isset($_POST['charset']) ? $_POST['charset'] : ''; +$tb_url = isset( $_POST['url'] ) ? $_POST['url'] : ''; +$charset = isset( $_POST['charset'] ) ? $_POST['charset'] : ''; // These three are stripslashed here so they can be properly escaped after mb_convert_encoding(). -$title = isset($_POST['title']) ? wp_unslash($_POST['title']) : ''; -$excerpt = isset($_POST['excerpt']) ? wp_unslash($_POST['excerpt']) : ''; -$blog_name = isset($_POST['blog_name']) ? wp_unslash($_POST['blog_name']) : ''; - -if ($charset) - $charset = str_replace( array(',', ' '), '', strtoupper( trim($charset) ) ); -else - $charset = 'ASCII, UTF-8, ISO-8859-1, JIS, EUC-JP, SJIS'; +$title = isset( $_POST['title'] ) ? wp_unslash( $_POST['title'] ) : ''; +$excerpt = isset( $_POST['excerpt'] ) ? wp_unslash( $_POST['excerpt'] ) : ''; +$blog_name = isset( $_POST['blog_name'] ) ? wp_unslash( $_POST['blog_name'] ) : ''; + +if ( $charset ) { + $charset = str_replace( array( ',', ' ' ), '', strtoupper( trim( $charset ) ) ); +} else { $charset = 'ASCII, UTF-8, ISO-8859-1, JIS, EUC-JP, SJIS'; +} // No valid uses for UTF-7. -if ( false !== strpos($charset, 'UTF-7') ) +if ( false !== strpos( $charset, 'UTF-7' ) ) { die; +} // For international trackbacks. -if ( function_exists('mb_convert_encoding') ) { - $title = mb_convert_encoding($title, get_option('blog_charset'), $charset); - $excerpt = mb_convert_encoding($excerpt, get_option('blog_charset'), $charset); - $blog_name = mb_convert_encoding($blog_name, get_option('blog_charset'), $charset); +if ( function_exists( 'mb_convert_encoding' ) ) { + $title = mb_convert_encoding( $title, get_option( 'blog_charset' ), $charset ); + $excerpt = mb_convert_encoding( $excerpt, get_option( 'blog_charset' ), $charset ); + $blog_name = mb_convert_encoding( $blog_name, get_option( 'blog_charset' ), $charset ); } // Now that mb_convert_encoding() has been given a swing, we need to escape these three. -$title = wp_slash($title); -$excerpt = wp_slash($excerpt); -$blog_name = wp_slash($blog_name); +$title = wp_slash( $title ); +$excerpt = wp_slash( $excerpt ); +$blog_name = wp_slash( $blog_name ); -if ( is_single() || is_page() ) +if ( is_single() || is_page() ) { $tb_id = $posts[0]->ID; +} -if ( !isset($tb_id) || !intval( $tb_id ) ) +if ( ! isset( $tb_id ) || ! intval( $tb_id ) ) { trackback_response( 1, __( 'I really need an ID for this to work.' ) ); +} -if (empty($title) && empty($tb_url) && empty($blog_name)) { +if ( empty( $title ) && empty( $tb_url ) && empty( $blog_name ) ) { // If it doesn't look like a trackback at all. - wp_redirect(get_permalink($tb_id)); + wp_redirect( get_permalink( $tb_id ) ); exit; } -if ( !empty($tb_url) && !empty($title) ) { +if ( ! empty( $tb_url ) && ! empty( $title ) ) { /** * Fires before the trackback is added to a post. * @@ -105,12 +110,13 @@ */ do_action( 'pre_trackback_post', $tb_id, $tb_url, $charset, $title, $excerpt, $blog_name ); - header('Content-Type: text/xml; charset=' . get_option('blog_charset') ); + header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) ); - if ( !pings_open($tb_id) ) + if ( ! pings_open( $tb_id ) ) { trackback_response( 1, __( 'Sorry, trackbacks are closed for this item.' ) ); + } - $title = wp_html_excerpt( $title, 250, '…' ); + $title = wp_html_excerpt( $title, 250, '…' ); $excerpt = wp_html_excerpt( $excerpt, 252, '…' ); $comment_post_ID = (int) $tb_id; @@ -120,13 +126,14 @@ $comment_content = "$title\n\n$excerpt"; $comment_type = 'trackback'; - $dupe = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url) ); - if ( $dupe ) + $dupe = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url ) ); + if ( $dupe ) { trackback_response( 1, __( 'We already have a ping from that URL for this post.' ) ); + } - $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type'); + $commentdata = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type' ); - wp_new_comment($commentdata); + wp_new_comment( $commentdata ); $trackback_id = $wpdb->insert_id; /** @@ -138,4 +145,4 @@ */ do_action( 'trackback_post', $trackback_id ); trackback_response( 0 ); -} +}// End if(). Index: src/xmlrpc.php =================================================================== --- src/xmlrpc.php (revision 40901) +++ src/xmlrpc.php (working copy) @@ -10,65 +10,66 @@ * * @var bool */ -define('XMLRPC_REQUEST', true); +define( 'XMLRPC_REQUEST', true ); // Some browser-embedded clients send cookies. We don't want them. $_COOKIE = array(); // A bug in PHP < 5.2.2 makes $HTTP_RAW_POST_DATA not set by default, // but we can do it ourself. -if ( !isset( $HTTP_RAW_POST_DATA ) ) { +if ( ! isset( $HTTP_RAW_POST_DATA ) ) { $HTTP_RAW_POST_DATA = file_get_contents( 'php://input' ); } // fix for mozBlog and other cases where ' -'; ?> +'; ?> - WordPress - https://wordpress.org/ - - - - - - - WordPress + https://wordpress.org/ + + + + + + + - + * @since 3.5.0 + */ + do_action( 'xmlrpc_rsd_apis' ); + ?> +