Pinking shears 6-20000
git-svn-id: http://svn.automattic.com/wordpress/trunk@20000 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
e4ce1046b0
commit
d910c26182
|
@ -106,7 +106,7 @@ var ThemeScroller;
|
||||||
|
|
||||||
if ( $('.tablenav-pages').length )
|
if ( $('.tablenav-pages').length )
|
||||||
this.pollInterval =
|
this.pollInterval =
|
||||||
setInterval( function() {
|
setInterval( function() {
|
||||||
return self.poll();
|
return self.poll();
|
||||||
}, this.scrollPollingDelay );
|
}, this.scrollPollingDelay );
|
||||||
},
|
},
|
||||||
|
|
|
@ -31,7 +31,7 @@ var wpCookies = {
|
||||||
/**
|
/**
|
||||||
* Get a multi-values cookie.
|
* Get a multi-values cookie.
|
||||||
* Returns a JS object with the name: 'value' pairs.
|
* Returns a JS object with the name: 'value' pairs.
|
||||||
*/
|
*/
|
||||||
getHash : function(name) {
|
getHash : function(name) {
|
||||||
var all = this.get(name), ret;
|
var all = this.get(name), ret;
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ var wpCookies = {
|
||||||
* Set a multi-values cookie.
|
* Set a multi-values cookie.
|
||||||
*
|
*
|
||||||
* 'values_obj' is the JS object that is stored. It is encoded as URI in wpCookies.set().
|
* '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) {
|
setHash : function(name, values_obj, expires, path, domain, secure) {
|
||||||
var str = '';
|
var str = '';
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ var wpCookies = {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get a cookie.
|
* Get a cookie.
|
||||||
*/
|
*/
|
||||||
get : function(name) {
|
get : function(name) {
|
||||||
var cookie = document.cookie, e, p = name + "=", b;
|
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)
|
* The 'expires' arg can be either a JS Date() object set to the expiration date (back-compat)
|
||||||
* or the number of seconds until expiration
|
* or the number of seconds until expiration
|
||||||
*/
|
*/
|
||||||
set : function(name, value, expires, path, domain, secure) {
|
set : function(name, value, expires, path, domain, secure) {
|
||||||
var d = new Date();
|
var d = new Date();
|
||||||
|
|
||||||
|
@ -118,7 +118,7 @@ var wpCookies = {
|
||||||
* Remove a cookie.
|
* Remove a cookie.
|
||||||
*
|
*
|
||||||
* This is done by setting it to an empty value and setting the expiration time in the past.
|
* This is done by setting it to an empty value and setting the expiration time in the past.
|
||||||
*/
|
*/
|
||||||
remove : function(name, path) {
|
remove : function(name, path) {
|
||||||
this.set(name, '', -1000, path);
|
this.set(name, '', -1000, path);
|
||||||
}
|
}
|
||||||
|
|
|
@ -410,7 +410,7 @@ EOD;
|
||||||
$post_content = '';
|
$post_content = '';
|
||||||
$post_excerpt = '';
|
$post_excerpt = '';
|
||||||
$pubtimes = '';
|
$pubtimes = '';
|
||||||
|
|
||||||
if ( isset( $entry->title ) && is_array( $entry->title ) && !empty( $entry->title[1] ) )
|
if ( isset( $entry->title ) && is_array( $entry->title ) && !empty( $entry->title[1] ) )
|
||||||
$post_title = (string) $entry->title[1];
|
$post_title = (string) $entry->title[1];
|
||||||
if ( isset( $entry->content ) && is_array( $entry->content ) && !empty( $entry->content[1] ) )
|
if ( isset( $entry->content ) && is_array( $entry->content ) && !empty( $entry->content[1] ) )
|
||||||
|
@ -419,7 +419,7 @@ EOD;
|
||||||
$post_excerpt = (string) $entry->summary[1];
|
$post_excerpt = (string) $entry->summary[1];
|
||||||
if ( !empty( $entry->published ) )
|
if ( !empty( $entry->published ) )
|
||||||
$pubtimes = (string) $entry->published;
|
$pubtimes = (string) $entry->published;
|
||||||
|
|
||||||
$pubtimes = $this->get_publish_time( $pubtimes );
|
$pubtimes = $this->get_publish_time( $pubtimes );
|
||||||
|
|
||||||
$post_date = $pubtimes[0];
|
$post_date = $pubtimes[0];
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
* @subpackage Customize
|
* @subpackage Customize
|
||||||
* @since 3.4.0
|
* @since 3.4.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class WP_Customize_Setting {
|
class WP_Customize_Setting {
|
||||||
public $id;
|
public $id;
|
||||||
public $priority = 10;
|
public $priority = 10;
|
||||||
|
@ -98,7 +98,7 @@ class WP_Customize_Setting {
|
||||||
* Callback function to filter the theme mods and options.
|
* Callback function to filter the theme mods and options.
|
||||||
*
|
*
|
||||||
* @since 3.4.0
|
* @since 3.4.0
|
||||||
*
|
*
|
||||||
* @param mixed Old value.
|
* @param mixed Old value.
|
||||||
* @return mixed New or old value.
|
* @return mixed New or old value.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -637,8 +637,8 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
return new IXR_Error( 403, __( 'Invalid post type' ) );
|
return new IXR_Error( 403, __( 'Invalid post type' ) );
|
||||||
|
|
||||||
$update = false;
|
$update = false;
|
||||||
if ( ! empty( $post_data[ 'ID' ] ) )
|
if ( ! empty( $post_data[ 'ID' ] ) )
|
||||||
$update = true;
|
$update = true;
|
||||||
|
|
||||||
if ( $update ) {
|
if ( $update ) {
|
||||||
if ( ! current_user_can( $post_type->cap->edit_post, $post_data[ 'ID' ] ) )
|
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
|
// Do some timestamp voodoo
|
||||||
if ( ! empty( $post_data['post_date_gmt'] ) ) {
|
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
|
// 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'] ) ) {
|
} elseif ( ! empty( $post_data['post_date'] ) ) {
|
||||||
$dateCreated = $post_data['post_date']->getIso();
|
$dateCreated = $post_data['post_date']->getIso();
|
||||||
}
|
}
|
||||||
|
@ -3201,7 +3201,7 @@ class wp_xmlrpc_server extends IXR_Server {
|
||||||
$menu_order = $content_struct['wp_page_order'];
|
$menu_order = $content_struct['wp_page_order'];
|
||||||
|
|
||||||
if ( ! empty( $content_struct['wp_page_template'] ) && 'page' == $post_type )
|
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'];
|
$post_author = $postdata['post_author'];
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ class WP_Scripts extends WP_Dependencies {
|
||||||
if ( ! function_exists( 'did_action' ) || did_action( 'init' ) )
|
if ( ! function_exists( 'did_action' ) || did_action( 'init' ) )
|
||||||
$this->init();
|
$this->init();
|
||||||
else
|
else
|
||||||
add_action( 'init', array( $this, 'init' ), 0 );
|
add_action( 'init', array( $this, 'init' ), 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
function init() {
|
function init() {
|
||||||
|
|
|
@ -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);
|
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
|
* 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.
|
* to recall previous comments by this commentator that are still held in moderation.
|
||||||
*
|
*
|
||||||
* @param object $comment Comment object.
|
* @param object $comment Comment object.
|
||||||
* @param object $user Comment author's object.
|
* @param object $user Comment author's object.
|
||||||
*
|
*
|
||||||
* @since 3.4.0
|
* @since 3.4.0
|
||||||
*/
|
*/
|
||||||
function wp_set_comment_cookies($comment, $user) {
|
function wp_set_comment_cookies($comment, $user) {
|
||||||
if ( $user->ID )
|
if ( $user->ID )
|
||||||
return;
|
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_' . 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_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);
|
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.
|
* Sanitizes the cookies sent to the user already.
|
||||||
|
|
|
@ -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
|
* @since 0.71
|
||||||
* @deprecated Use error_log()
|
* @deprecated Use error_log()
|
||||||
|
|
|
@ -20,7 +20,7 @@ require( ABSPATH . WPINC . '/option.php' );
|
||||||
*
|
*
|
||||||
* @param string $format Format of the date to return.
|
* @param string $format Format of the date to return.
|
||||||
* @param string $date Date string to convert.
|
* @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.
|
* @return string|int Formatted date string, or Unix timestamp.
|
||||||
*/
|
*/
|
||||||
function mysql2date( $format, $date, $translate = true ) {
|
function mysql2date( $format, $date, $translate = true ) {
|
||||||
|
|
|
@ -1869,7 +1869,7 @@ function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
|
||||||
$url = get_blog_option( $blog_id, 'home' );
|
$url = get_blog_option( $blog_id, 'home' );
|
||||||
|
|
||||||
if ( 'relative' == $scheme )
|
if ( 'relative' == $scheme )
|
||||||
$url = preg_replace( '#^.+://[^/]*#', '', $url );
|
$url = preg_replace( '#^.+://[^/]*#', '', $url );
|
||||||
elseif ( 'http' != $scheme )
|
elseif ( 'http' != $scheme )
|
||||||
$url = str_replace( 'http://', "$scheme://", $url );
|
$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' );
|
$url = get_blog_option( $blog_id, 'siteurl' );
|
||||||
|
|
||||||
if ( 'relative' == $scheme )
|
if ( 'relative' == $scheme )
|
||||||
$url = preg_replace( '#^.+://[^/]*#', '', $url );
|
$url = preg_replace( '#^.+://[^/]*#', '', $url );
|
||||||
elseif ( 'http' != $scheme )
|
elseif ( 'http' != $scheme )
|
||||||
$url = str_replace( 'http://', "{$scheme}://", $url );
|
$url = str_replace( 'http://', "{$scheme}://", $url );
|
||||||
|
|
||||||
|
|
|
@ -639,7 +639,7 @@ class WP_Rewrite {
|
||||||
* would have a set of rules added to the top of the rewrite rules array.
|
* 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
|
* Now it tells {@link WP::parse_request()} to check if a URL matching the
|
||||||
* page permastruct is actually a page before accepting it.
|
* page permastruct is actually a page before accepting it.
|
||||||
*
|
*
|
||||||
* @link http://core.trac.wordpress.org/ticket/16687
|
* @link http://core.trac.wordpress.org/ticket/16687
|
||||||
* @see WP_Rewrite::init()
|
* @see WP_Rewrite::init()
|
||||||
* @since 2.5.0
|
* @since 2.5.0
|
||||||
|
|
|
@ -163,7 +163,7 @@ function wp_update_plugins() {
|
||||||
default :
|
default :
|
||||||
$timeout = 43200; // 12 hours
|
$timeout = 43200; // 12 hours
|
||||||
}
|
}
|
||||||
|
|
||||||
$time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
|
$time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
|
||||||
|
|
||||||
if ( $time_not_changed ) {
|
if ( $time_not_changed ) {
|
||||||
|
@ -275,7 +275,7 @@ function wp_update_themes() {
|
||||||
default :
|
default :
|
||||||
$timeout = 43200; // 12 hours
|
$timeout = 43200; // 12 hours
|
||||||
}
|
}
|
||||||
|
|
||||||
$time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time( ) - $last_update->last_checked );
|
$time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time( ) - $last_update->last_checked );
|
||||||
|
|
||||||
if ( $time_not_changed ) {
|
if ( $time_not_changed ) {
|
||||||
|
|
Loading…
Reference in New Issue