WordPress 3.4

[autoinstalls/wordpress.git] / wp-admin / includes / misc.php

diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index 594ec7a7fd547d5e251993ff6fd477c53bb36412..14f94fbed7c863d98df9c59e0ceec408607b917e 100644 (file)
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -196,17 +196,15 @@ function update_recently_edited( $file ) {
  *
  * @since 2.1.0
  *
- * @param unknown_type $old_value
- * @param unknown_type $value
+ * @param string $old_value
+ * @param string $value
  */
 function update_home_siteurl( $old_value, $value ) {
-       global $wp_rewrite;
-
        if ( defined( "WP_INSTALLING" ) )
                return;
 
        // If home changed, write rewrite rules to new location.
-       $wp_rewrite->flush_rules();
+       flush_rewrite_rules();
 }
 
 add_action( 'update_option_home', 'update_home_siteurl', 10, 2 );
@@ -340,7 +338,6 @@ function set_screen_options() {
                if ( in_array( $type, get_taxonomies()) )
                        $map_option = 'edit_tags_per_page';
 
-
                switch ( $map_option ) {
                        case 'edit_per_page':
                        case 'users_per_page':
@@ -586,10 +583,10 @@ foreach ( $_wp_admin_css_colors as $color => $color_info ): ?>
 }
 
 function _ipad_meta() {
-       if ( strpos($_SERVER['HTTP_USER_AGENT'], 'iPad') !== false ) { ?>
-               <meta name="viewport" id="ipad-viewportmeta" content="width=device-width, initial-scale=1">
-       <?php
+       if ( wp_is_mobile() ) {
+               ?>
+               <meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1">
+               <?php
        }
 }
 add_action('admin_head', '_ipad_meta');
-