Changeset 1271 in tests

Timestamp:

04/23/2013 01:38:08 AM (13 years ago)

Author:

SergeyBiryukov

Message:

Correctly save and restore current locale settings in test_locale_floats(). see [746/tests].

File:

• trunk/tests/db.php (modified) (2 diffs)

trunk/tests/db.php

@@ -50 +50 @@
                 global $wpdb;
 
-                // Save the current locale
-                $current_locale = setlocale( LC_ALL, NULL );
+                // Save the current locale settings
+                $current_locales = explode( ';', setlocale( LC_ALL, 0 ) );
 
                 // Switch to Russian
@@ -76 +76 @@
                 $this->assertContains( '0.700', $sql );
 
-                // Restore locale
-                setlocale( LC_ALL, $current_locale );
+                // Restore locale settings
+                foreach ( $current_locales as $locale_setting ) {
+                        if ( false !== strpos( $locale_setting, '=' ) ) {
+                                list( $category, $locale ) = explode( '=', $locale_setting );
+                                setlocale( constant( $category ), $locale );
+                        } else {
+                                setlocale( LC_ALL, $locale_setting );
+                        }
+                }
         }