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

Pinking shears 

Built from https://develop.svn.wordpress.org/trunk@25085


git-svn-id: http://core.svn.wordpress.org/trunk@25069 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2013-08-22 15:56:08 +00:00
parent eb44516e48
commit f2f939fed4
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/class-wp-image-editor.php
View File

@ -330,8 +330,8 @@ abstract class WP_Image_Editor {
if ( $stream = wp_is_stream( $filename ) ) { if ( $stream = wp_is_stream( $filename ) ) {
ob_start(); ob_start();
} else { } else {
// The directory containing the original file may no longer exist when using a replication plugin. // The directory containing the original file may no longer exist when using a replication plugin.
wp_mkdir_p( dirname( $filename ) ); wp_mkdir_p( dirname( $filename ) );
} }
$result = call_user_func_array( $function, $arguments ); $result = call_user_func_array( $function, $arguments );

2
wp-includes/l10n.php
View File

@ -498,7 +498,7 @@ function load_theme_textdomain( $domain, $path = false ) {
if ( ! $path ) if ( ! $path )
$path = get_template_directory(); $path = get_template_directory();
// Load the textdomain according to the theme // Load the textdomain according to the theme
$mofile = "{$path}/{$locale}.mo"; $mofile = "{$path}/{$locale}.mo";
if ( $loaded = load_textdomain( $domain, $mofile ) ) if ( $loaded = load_textdomain( $domain, $mofile ) )
return $loaded; return $loaded;

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

@ -2351,7 +2351,7 @@ function wp_get_shortlink($id = 0, $context = 'post', $allow_slugs = true) {
global $wp_query; global $wp_query;
$post_id = 0; $post_id = 0;
if ( 'query' == $context && is_singular() ) { if ( 'query' == $context && is_singular() ) {
$post_id = $wp_query->get_queried_object_id(); $post_id = $wp_query->get_queried_object_id();
$post = get_post( $post_id ); $post = get_post( $post_id );
} elseif ( 'post' == $context ) { } elseif ( 'post' == $context ) {

2
wp-includes/ms-functions.php
View File

@ -1703,7 +1703,7 @@ function fix_phpmailer_messageid( $phpmailer ) {
* @uses get_user_by() * @uses get_user_by()
* *
* @param string|WP_User $user Optional. Defaults to current user. WP_User object, * @param string|WP_User $user Optional. Defaults to current user. WP_User object,
* or user login name as a string. * or user login name as a string.
* @return bool * @return bool
*/ */
function is_user_spammy( $user = null ) { function is_user_spammy( $user = null ) {