mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-08-11 20:30:23 +00:00
Pinking shears
git-svn-id: https://develop.svn.wordpress.org/trunk@19054 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
@@ -1626,12 +1626,12 @@ class WP_Http_Encoding {
|
||||
* Decompression of deflated string while staying compatible with the majority of servers.
|
||||
*
|
||||
* Certain Servers will return deflated data with headers which PHP's gziniflate()
|
||||
* function cannot handle out of the box. The following function has been created from
|
||||
* various snippets on the gzinflate() PHP documentation.
|
||||
* function cannot handle out of the box. The following function has been created from
|
||||
* various snippets on the gzinflate() PHP documentation.
|
||||
*
|
||||
* Warning: Magic numbers within. Due to the potential different formats that the compressed
|
||||
* data may be returned in, some "magic offsets" are needed to ensure proper decompression
|
||||
* takes place. For a simple progmatic way to determine the magic offset in use, see:
|
||||
* takes place. For a simple progmatic way to determine the magic offset in use, see:
|
||||
* http://core.trac.wordpress.org/ticket/18273
|
||||
*
|
||||
* @since 2.8.1
|
||||
|
||||
@@ -375,7 +375,7 @@ class WP_Editor {
|
||||
elseif ( ($key = array_search('fullscreen', $mce_buttons_2)) !== false )
|
||||
$mce_buttons_2[$key] = 'wp_fullscreen';
|
||||
elseif ( ($key = array_search('fullscreen', $mce_buttons_3)) !== false )
|
||||
$mce_buttons_3[$key] = 'wp_fullscreen';
|
||||
$mce_buttons_3[$key] = 'wp_fullscreen';
|
||||
elseif ( ($key = array_search('fullscreen', $mce_buttons_4)) !== false )
|
||||
$mce_buttons_4[$key] = 'wp_fullscreen';
|
||||
}
|
||||
|
||||
@@ -2826,10 +2826,10 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
|
||||
nocache_headers();
|
||||
header( 'Content-Type: text/html; charset=utf-8' );
|
||||
}
|
||||
|
||||
|
||||
if ( empty($title) )
|
||||
$title = $have_gettext ? __('WordPress › Error') : 'WordPress › Error';
|
||||
|
||||
|
||||
$text_direction = 'ltr';
|
||||
if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] )
|
||||
$text_direction = 'rtl';
|
||||
|
||||
@@ -77,7 +77,7 @@ function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_f
|
||||
* The $data array is JSON encoded. If called more than once for the same $handle with the same $name,
|
||||
* the object would contain all values. In that case if two or more keys are the same,
|
||||
* the last value overwrites the previous. The function is named "localize_script" because of historical reasons.
|
||||
*
|
||||
*
|
||||
* @since r16
|
||||
* @see WP_Scripts::add_script_data()
|
||||
*/
|
||||
|
||||
@@ -44,7 +44,7 @@ function wp_print_styles( $handles = false ) {
|
||||
* Accepts a string $data containing the CSS. If two or more CSS code blocks are
|
||||
* added to the same stylesheet $handle, they will be printed in the order
|
||||
* they were added, i.e. the latter added styles can redeclare the previous.
|
||||
*
|
||||
*
|
||||
* @since 3.3
|
||||
* @see WP_Scripts::add_inline_style()
|
||||
*/
|
||||
|
||||
@@ -1128,7 +1128,7 @@ function get_adjacent_post( $in_same_cat = false, $excluded_categories = '', $pr
|
||||
}
|
||||
|
||||
$excluded_categories = array_map( 'intval', $excluded_categories );
|
||||
|
||||
|
||||
if ( ! empty( $cat_array ) ) {
|
||||
$excluded_categories = array_diff($excluded_categories, $cat_array);
|
||||
$posts_in_ex_cats_sql = '';
|
||||
@@ -1276,7 +1276,7 @@ function get_boundary_post( $in_same_cat = false, $excluded_categories = '', $st
|
||||
$cat_array = array();
|
||||
if( ! is_array( $excluded_categories ) )
|
||||
$excluded_categories = explode( ',', $excluded_categories );
|
||||
|
||||
|
||||
if ( $in_same_cat || ! empty( $excluded_categories ) ) {
|
||||
if ( $in_same_cat )
|
||||
$cat_array = wp_get_object_terms( $post->ID, 'category', array( 'fields' => 'ids' ) );
|
||||
|
||||
@@ -307,7 +307,7 @@ function get_metadata($meta_type, $object_id, $meta_key = '', $single = false) {
|
||||
*
|
||||
* @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
|
||||
* @param int $object_id ID of the object metadata is for
|
||||
* @param string $meta_key Metadata key.
|
||||
* @param string $meta_key Metadata key.
|
||||
* @return boolean true of the key is set, false if not.
|
||||
*/
|
||||
function metadata_exists( $meta_type, $object_id, $meta_key ) {
|
||||
|
||||
@@ -1040,7 +1040,7 @@ function register_post_type($post_type, $args = array()) {
|
||||
}
|
||||
|
||||
do_action( 'registered_post_type', $post_type, $args );
|
||||
|
||||
|
||||
return $args;
|
||||
}
|
||||
|
||||
@@ -5308,7 +5308,7 @@ add_filter( 'wp_get_object_terms', '_post_format_wp_get_object_terms' );
|
||||
|
||||
/**
|
||||
* Update the custom taxonomies' term counts when a post's status is changed. For example, default posts term counts (for custom taxonomies) don't include private / draft posts.
|
||||
*
|
||||
*
|
||||
* @access private
|
||||
* @param string $new_status
|
||||
* @param string $old_status
|
||||
|
||||
@@ -2854,7 +2854,7 @@ function _update_post_term_count( $terms, $taxonomy ) {
|
||||
global $wpdb;
|
||||
|
||||
$object_types = (array) $taxonomy->object_type;
|
||||
|
||||
|
||||
foreach ( $object_types as &$object_type )
|
||||
list( $object_type ) = explode( ':', $object_type );
|
||||
|
||||
@@ -2878,7 +2878,7 @@ function _update_post_term_count( $terms, $taxonomy ) {
|
||||
if ( $object_types )
|
||||
$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode("', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) );
|
||||
|
||||
|
||||
|
||||
do_action( 'edit_term_taxonomy', $term, $taxonomy );
|
||||
$wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
|
||||
do_action( 'edited_term_taxonomy', $term, $taxonomy );
|
||||
|
||||
@@ -330,7 +330,7 @@ function wp_get_update_data() {
|
||||
$update_title[] = sprintf(_n('%d Theme Update', '%d Theme Updates', $counts['themes']), $counts['themes']);
|
||||
|
||||
$update_title = ! empty( $update_title ) ? esc_attr( implode( ', ', $update_title ) ) : '';
|
||||
|
||||
|
||||
return array( 'counts' => $counts, 'title' => $update_title );
|
||||
}
|
||||
|
||||
|
||||
@@ -1150,7 +1150,7 @@ function _get_widget_id_base($id) {
|
||||
*
|
||||
* @access private
|
||||
* @since 3.3
|
||||
*/
|
||||
*/
|
||||
function _wp_sidebars_changed() {
|
||||
global $sidebars_widgets;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user