← Back to branch summary

~canonical-sysadmins/wordpress/4.1.3

« back to all changes in this revision

Viewing changes to wp-includes/class-wp-image-editor-imagick.php

  • Committer: Nick Moffitt
  • Date: 2015-01-15 11:05:37 UTC
  • mfrom: (1.1.1 wp4-upstream)
  • Revision ID: nick.moffitt@canonical.com-20150115110537-8bp1y42eyg0jsa7c
Tags: 4.1
Merge upstream version 4.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/class-wp-image-editor-imagick.php
15
15
 * @uses WP_Image_Editor Extends class
16
16
 */
17
17
class WP_Image_Editor_Imagick extends WP_Image_Editor {
18
 
 
19
 
        protected $image = null; // Imagick Object
 
18
        /**
 
19
         * @var Imagick
 
20
         */
 
21
        protected $image; // Imagick Object
20
22
 
21
23
        public function __destruct() {
22
24
                if ( $this->image instanceof Imagick ) {
140
142
                }
141
143
 
142
144
                $updated_size = $this->update_size();
143
 
                if ( is_wp_error( $updated_size ) )
144
 
                                return $updated_size;
 
145
                if ( is_wp_error( $updated_size ) ) {
 
146
                        return $updated_size;
 
147
                }
145
148
 
146
 
                return true;
 
149
                return $this->set_quality();
147
150
        }
148
151
 
149
152
        /**