Changeset 28966 for trunk/tests/phpunit/tests/query/conditionals.php

Timestamp:

07/03/2014 01:42:57 AM (10 years ago)

Author:

wonderboymusic

Message:

Setup rewrite changes in tests in a predictable fashion. Don't mix method calls with wrapper function calls.

See #28706.

File:

• trunk/tests/phpunit/tests/query/conditionals.php (modified) (1 diff)

trunk/tests/phpunit/tests/query/conditionals.php

@@ -24 +24 @@
 
         global $wp_rewrite;
-        update_option( 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/' );
+
+        $wp_rewrite->init();
+        $wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+
         create_initial_taxonomies();
-        $GLOBALS['wp_rewrite']->init();
-        flush_rewrite_rules();
+
+        $wp_rewrite->flush_rules();
     }
 
     function tearDown() {
+        global $wp_rewrite;
         parent::tearDown();
-        $GLOBALS['wp_rewrite']->init();
+        $wp_rewrite->init();
     }