diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-24 12:40:34 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-24 12:40:34 +0000 |
| commit | 9384882739906e813f1a05491fd73e47e8105dee (patch) | |
| tree | a14f52d7e2cb2fcce1ab890932c18358d4c4c973 /wp-admin/admin-functions.php | |
| parent | 30d41198c601e5514acad67eb5fbb2e9f6854571 (diff) | |
| download | wordpress-mu-9384882739906e813f1a05491fd73e47e8105dee.tar.gz wordpress-mu-9384882739906e813f1a05491fd73e47e8105dee.tar.xz wordpress-mu-9384882739906e813f1a05491fd73e47e8105dee.zip | |
WP Merge to revision 4793
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@865 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/admin-functions.php')
| -rw-r--r-- | wp-admin/admin-functions.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 03a6887..b274e67 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -1282,7 +1282,7 @@ function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) { if ( $items ) { foreach ( $items as $item ) { - // A page cannot be it's own parent. + // A page cannot be its own parent. if (!empty ( $post_ID ) ) { if ( $item->ID == $post_ID ) { continue; @@ -2203,7 +2203,7 @@ function wp_create_thumbnail( $file, $max_side, $effect = '' ) { $thumbpath = str_replace( basename( $file ), $thumb, $file ); - // move the thumbnail to it's final destination + // move the thumbnail to its final destination if ( $type[2] == 1 ) { if (!imagegif( $thumbnail, $thumbpath ) ) { $error = __( "Thumbnail path invalid" ); @@ -2228,8 +2228,7 @@ function wp_create_thumbnail( $file, $max_side, $effect = '' ) { if (!empty ( $error ) ) { return $error; } else { - apply_filters( 'wp_create_thumbnail', $thumbpath ); - return $thumbpath; + return apply_filters( 'wp_create_thumbnail', $thumbpath ); } } |