Changeset 27358

Timestamp:

03/02/2014 10:22:41 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Restore $content_width global value after changing it in test_constrain_size_for_editor_*().

props ericlewis, georgestephanis, salcode, jorbin.
fixes #27256.

File:

• trunk/tests/phpunit/tests/image/size.php (modified) (3 diffs)

trunk/tests/phpunit/tests/image/size.php

@@ -174 +174 @@
         // default max width is 500, no constraint on height
         global $content_width;
+
+        $_content_width = $content_width;
+
         $content_width = 0;
         update_option('medium_size_w', 500);
@@ -191 +194 @@
         $out = image_constrain_size_for_editor(600, 400, 'medium');
         $this->assertEquals(array(500, 333), $out);
+
+        $content_width = $_content_width;
     }
 
     function test_constrain_size_for_editor_full() {
         global $content_width;
+
+        $_content_width = $content_width;
+
         $content_width = 400;
         $out = image_constrain_size_for_editor(600, 400, 'full');
@@ -210 +218 @@
         $out = image_constrain_size_for_editor(64, 64, 'full');
         $this->assertEquals(array(64, 64), $out);
+
+        $content_width = $_content_width;
     }