Pinking shears

git-svn-id: http://core.svn.wordpress.org/trunk@20715 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2012-05-03 16:41:59 +00:00
parent 281ad053fc
commit 8c114f0c54
13 changed files with 17 additions and 17 deletions

View File

@ -665,7 +665,7 @@ function link_categories_meta_box($link) {
<li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
<li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
</ul>
<div id="categories-all" class="tabs-panel">
<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
<?php
@ -676,13 +676,13 @@ function link_categories_meta_box($link) {
?>
</ul>
</div>
<div id="categories-pop" class="tabs-panel" style="display: none;">
<ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
<?php wp_popular_terms_checklist('link_category'); ?>
</ul>
</div>
<div id="category-adder" class="wp-hidden-children">
<h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
<p id="link-category-add" class="wp-hidden-child">

View File

@ -747,7 +747,7 @@ function update_meta( $meta_id, $meta_key, $meta_value ) {
function _fix_attachment_links( $post_ID ) {
$post = & get_post( $post_ID, ARRAY_A );
$content = $post['post_content'];
// quick sanity check, don't run if no pretty permalinks or post is not published
if ( !get_option('permalink_structure') || $post['post_status'] != 'publish' )
return;

View File

@ -809,7 +809,7 @@ final class WP_Screen {
if ( $this->get_option( 'layout_columns' ) ) {
$this->columns = (int) get_user_option("screen_layout_$this->id");
if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) )
$this->columns = $this->get_option( 'layout_columns', 'default' );
}

View File

@ -223,7 +223,7 @@ function get_theme_updates() {
if ( ! isset( $current->response ) )
return array();
$update_themes = array();
$update_themes = array();
foreach ( $current->response as $stylesheet => $data ) {
$update_themes[ $stylesheet ] = wp_get_theme( $stylesheet );
$update_themes[ $stylesheet ]->update = $data;

View File

@ -91,7 +91,7 @@ get_current_screen()->set_help_sidebar(
'<p>' . __( '<a href="http://codex.wordpress.org/Dashboard_Screen" target="_blank">Documentation on Dashboard</a>' ) . '</p>' .
'<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
);
include (ABSPATH . 'wp-admin/admin-header.php');
$today = current_time('mysql', 1);

View File

@ -163,7 +163,7 @@ if ( !$mysql_compat || !$php_compat ) {
}
if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) {
display_header();
display_header();
die( '<h1>' . __( 'Configuration Error' ) . '</h1><p>' . __( 'Your <code>wp-config.php</code> file has an empty database table prefix, which is not supported.' ) . '</p></body></html>' );
}

View File

@ -1643,7 +1643,7 @@ class PHPMailer {
if (version_compare(PHP_VERSION, '5.3.0', '<')) {
set_magic_quotes_runtime(0);
} else {
ini_set('magic_quotes_runtime', 0);
ini_set('magic_quotes_runtime', 0);
}
}
$file_buffer = file_get_contents($path);
@ -1652,7 +1652,7 @@ class PHPMailer {
if (version_compare(PHP_VERSION, '5.3.0', '<')) {
set_magic_quotes_runtime($magic_quotes);
} else {
ini_set('magic_quotes_runtime', $magic_quotes);
ini_set('magic_quotes_runtime', $magic_quotes);
}
}
return $file_buffer;

View File

@ -2775,7 +2775,7 @@ class SimplePie
function get_latitude()
{
if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
{
return (float) $return[0]['data'];

View File

@ -346,7 +346,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] ) )
@ -355,7 +355,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];

View File

@ -372,7 +372,7 @@ final class WP_Theme implements ArrayAccess {
* Method to implement ArrayAccess for keys formerly returned by get_themes().
*
* Author, Author Name, Author URI, and Description did not previously return
* translated data. We are doing so now as it is safe to do. However, as
* translated data. We are doing so now as it is safe to do. However, as
* Name and Title could have been used as the key for get_themes(), both remain
* untranslated for back compatibility. This means that ['Name'] is not ideal,
* and care should be taken to use $theme->display('Name') to get a properly

View File

@ -3275,7 +3275,7 @@ class wp_xmlrpc_server extends IXR_Server {
$post_data = wp_get_single_post($post_ID, ARRAY_A);
if ( ! $post_data )
return new IXR_Error( 404, __( 'Invalid post ID.' ) );
if ( !current_user_can( 'edit_post', $post_ID ) )
return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) );

View File

@ -2996,7 +2996,7 @@ function get_current_theme() {
*/
function clean_pre($matches) {
_deprecated_function( __FUNCTION__, '3.4' );
if ( is_array($matches) )
$text = $matches[1] . $matches[2] . "</pre>";
else

View File

@ -3686,7 +3686,7 @@ function _device_can_upload() {
return true;
$ua = $_SERVER['HTTP_USER_AGENT'];
if ( strpos($ua, 'iPhone') !== false
|| strpos($ua, 'iPad') !== false
|| strpos($ua, 'iPod') !== false ) {