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

Docs: Improve DocBlock syntax and add a missing `@return` notation for `WP_Image_Editor_Imagick::strip_meta()`, introduced in [36700]. 

See: #33642, #30402, #28634. See #35986.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36814 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2016-03-04 17:37:27 +00:00
parent d8f8f68d42
commit bbc3cde9b0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/class-wp-image-editor-imagick.php
View File

@ -654,10 +654,12 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
} }
/** /**
* Strip all image meta except color profiles from an image. * Strips all image meta except color profiles from an image.
* *
* @access protected
* @since 4.5.0 * @since 4.5.0
* @access protected
*
* @return true|WP_Error True if stripping metadata was successful. WP_Error object on error.
*/ */
protected function strip_meta() { protected function strip_meta() {
try { try {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-beta2-36846'; $wp_version = '4.5-beta2-36847';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.