Changeset 30788 for trunk/src/wp-includes/class-wp-image-editor.php

Timestamp:

12/08/2014 04:18:42 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Move the logic from WP_Image_Editor::get_quality() to WP_Image_Editor::set_quality(), so that 'wp_editor_set_quality' and 'jpeg_quality' filters run when setting the default value.

props markoheijnen.
fixes #29856.

File:

• trunk/src/wp-includes/class-wp-image-editor.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-image-editor.php

@@ -214 +214 @@
     public function get_quality() {
         if ( ! $this->quality ) {
+            $this->set_quality();
+        }
+
+        return $this->quality;
+    }
+
+    /**
+     * Sets Image Compression quality on a 1-100% scale.
+     *
+     * @since 3.5.0
+     * @access public
+     *
+     * @param int $quality Compression Quality. Range: [1,100]
+     * @return boolean|WP_Error True if set successfully; WP_Error on failure.
+     */
+    public function set_quality( $quality = null ) {
+        if ( null === $quality ) {
             /**
              * Filter the default image compression quality setting.
@@ -239 +256 @@
             }
 
-            if ( ! $this->set_quality( $quality ) ) {
-                $this->quality = $this->default_quality;
+            if ( $quality < 0 || $quality > 100 ) {
+                $quality = $this->default_quality;
             }
-        }
-
-        return $this->quality;
-    }
-
-    /**
-     * Sets Image Compression quality on a 1-100% scale.
-     *
-     * @since 3.5.0
-     * @access public
-     *
-     * @param int $quality Compression Quality. Range: [1,100]
-     * @return boolean|WP_Error True if set successfully; WP_Error on failure.
-     */
-    public function set_quality( $quality = null ) {
-        if ( null === $quality ) {
-            $quality = $this->default_quality;
         }