Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pinking shears 6-20000 

git-svn-id: http://svn.automattic.com/wordpress/trunk@20000 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2012-02-27 19:46:52 +00:00
parent e4ce1046b0
commit d910c26182
12 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/js/theme.dev.js
View File

@ -106,7 +106,7 @@ var ThemeScroller;
if ( $('.tablenav-pages').length )
this.pollInterval =
setInterval( function() {
setInterval( function() {
return self.poll();
}, this.scrollPollingDelay );
},

10
wp-admin/js/utils.dev.js
View File

@ -31,7 +31,7 @@ var wpCookies = {
/**
* Get a multi-values cookie.
* Returns a JS object with the name: 'value' pairs.
*/
*/
getHash : function(name) {
var all = this.get(name), ret;
@ -49,7 +49,7 @@ var wpCookies = {
* Set a multi-values cookie.
*
* 'values_obj' is the JS object that is stored. It is encoded as URI in wpCookies.set().
*/
*/
setHash : function(name, values_obj, expires, path, domain, secure) {
var str = '';
@ -62,7 +62,7 @@ var wpCookies = {
/**
* Get a cookie.
*/
*/
get : function(name) {
var cookie = document.cookie, e, p = name + "=", b;
@ -94,7 +94,7 @@ var wpCookies = {
*
* The 'expires' arg can be either a JS Date() object set to the expiration date (back-compat)
* or the number of seconds until expiration
*/
*/
set : function(name, value, expires, path, domain, secure) {
var d = new Date();
@ -118,7 +118,7 @@ var wpCookies = {
* Remove a cookie.
*
* This is done by setting it to an empty value and setting the expiration time in the past.
*/
*/
remove : function(name, path) {
this.set(name, '', -1000, path);
}

4
wp-app.php
View File

@ -410,7 +410,7 @@ EOD;
$post_content = '';
$post_excerpt = '';
$pubtimes = '';
if ( isset( $entry->title ) && is_array( $entry->title ) && !empty( $entry->title[1] ) )
$post_title = (string) $entry->title[1];
if ( isset( $entry->content ) && is_array( $entry->content ) && !empty( $entry->content[1] ) )
@ -419,7 +419,7 @@ EOD;
$post_excerpt = (string) $entry->summary[1];
if ( !empty( $entry->published ) )
$pubtimes = (string) $entry->published;
$pubtimes = $this->get_publish_time( $pubtimes );
$post_date = $pubtimes[0];

4
wp-includes/class-wp-customize-setting.php
View File

@ -6,7 +6,7 @@
* @subpackage Customize
* @since 3.4.0
*/
class WP_Customize_Setting {
public $id;
public $priority = 10;
@ -98,7 +98,7 @@ class WP_Customize_Setting {
* Callback function to filter the theme mods and options.
*
* @since 3.4.0
*
*
* @param mixed Old value.
* @return mixed New or old value.
*/

8
wp-includes/class-wp-xmlrpc-server.php
View File

@ -637,8 +637,8 @@ class wp_xmlrpc_server extends IXR_Server {
return new IXR_Error( 403, __( 'Invalid post type' ) );
$update = false;
if ( ! empty( $post_data[ 'ID' ] ) )
$update = true;
if ( ! empty( $post_data[ 'ID' ] ) )
$update = true;
if ( $update ) {
if ( ! current_user_can( $post_type->cap->edit_post, $post_data[ 'ID' ] ) )
@ -697,7 +697,7 @@ class wp_xmlrpc_server extends IXR_Server {
// Do some timestamp voodoo
if ( ! empty( $post_data['post_date_gmt'] ) ) {
// We know this is supposed to be GMT, so we're going to slap that Z on there by force
$dateCreated = str_replace( 'Z', '', $post_data['post_date_gmt']->getIso() ) . 'Z';
$dateCreated = str_replace( 'Z', '', $post_data['post_date_gmt']->getIso() ) . 'Z';
} elseif ( ! empty( $post_data['post_date'] ) ) {
$dateCreated = $post_data['post_date']->getIso();
}
@ -3201,7 +3201,7 @@ class wp_xmlrpc_server extends IXR_Server {
$menu_order = $content_struct['wp_page_order'];
if ( ! empty( $content_struct['wp_page_template'] ) && 'page' == $post_type )
$page_template = $content_struct['wp_page_template'];
$page_template = $content_struct['wp_page_template'];
$post_author = $postdata['post_author'];

2
wp-includes/class.wp-scripts.php
View File

@ -34,7 +34,7 @@ class WP_Scripts extends WP_Dependencies {
if ( ! function_exists( 'did_action' ) || did_action( 'init' ) )
$this->init();
else
add_action( 'init', array( $this, 'init' ), 0 );
add_action( 'init', array( $this, 'init' ), 0 );
}
function init() {

14
wp-includes/comment.php
View File

@ -569,16 +569,16 @@ function update_comment_meta($comment_id, $meta_key, $meta_value, $prev_value =
return update_metadata('comment', $comment_id, $meta_key, $meta_value, $prev_value);
}
/**
* Sets the cookies used to store an unauthenticated commentator's identity. Typically used
* to recall previous comments by this commentator that are still held in moderation.
*
/**
* Sets the cookies used to store an unauthenticated commentator's identity. Typically used
* to recall previous comments by this commentator that are still held in moderation.
*
* @param object $comment Comment object.
* @param object $user Comment author's object.
*
* @since 3.4.0
*/
function wp_set_comment_cookies($comment, $user) {
*/
function wp_set_comment_cookies($comment, $user) {
if ( $user->ID )
return;
@ -586,7 +586,7 @@ function wp_set_comment_cookies($comment, $user) {
setcookie('comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
setcookie('comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
setcookie('comment_author_url_' . COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
}
}
/**
* Sanitizes the cookies sent to the user already.

2
wp-includes/deprecated.php
View File

@ -2870,7 +2870,7 @@ function is_blog_user( $blog_id = 0 ) {
}
/**
* Open the file handle for debugging.
* Open the file handle for debugging.
*
* @since 0.71
* @deprecated Use error_log()

2
wp-includes/functions.php
View File

@ -20,7 +20,7 @@ require( ABSPATH . WPINC . '/option.php' );
*
* @param string $format Format of the date to return.
* @param string $date Date string to convert.
* @param bool $translate Whether the return date should be translated. Default is true.
* @param bool $translate Whether the return date should be translated. Default is true.
* @return string|int Formatted date string, or Unix timestamp.
*/
function mysql2date( $format, $date, $translate = true ) {

4
wp-includes/link-template.php
View File

@ -1869,7 +1869,7 @@ function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
$url = get_blog_option( $blog_id, 'home' );
if ( 'relative' == $scheme )
$url = preg_replace( '#^.+://[^/]*#', '', $url );
$url = preg_replace( '#^.+://[^/]*#', '', $url );
elseif ( 'http' != $scheme )
$url = str_replace( 'http://', "$scheme://", $url );
@ -1934,7 +1934,7 @@ function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
$url = get_blog_option( $blog_id, 'siteurl' );
if ( 'relative' == $scheme )
$url = preg_replace( '#^.+://[^/]*#', '', $url );
$url = preg_replace( '#^.+://[^/]*#', '', $url );
elseif ( 'http' != $scheme )
$url = str_replace( 'http://', "{$scheme}://", $url );

2
wp-includes/rewrite.php
View File

@ -639,7 +639,7 @@ class WP_Rewrite {
* would have a set of rules added to the top of the rewrite rules array.
* Now it tells {@link WP::parse_request()} to check if a URL matching the
* page permastruct is actually a page before accepting it.
*
*
* @link http://core.trac.wordpress.org/ticket/16687
* @see WP_Rewrite::init()
* @since 2.5.0

4
wp-includes/update.php
View File

@ -163,7 +163,7 @@ function wp_update_plugins() {
default :
$timeout = 43200; // 12 hours
}
$time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
if ( $time_not_changed ) {
@ -275,7 +275,7 @@ function wp_update_themes() {
default :
$timeout = 43200; // 12 hours
}
$time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time( ) - $last_update->last_checked );
if ( $time_not_changed ) {