WordPress 4.1.2-scripts

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

diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index 3680f8e5a954ec42eef6789d3c269306db1893da..7b710cb047168c1a9a841702c87394ec8135410b 100644 (file)
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -22,9 +22,10 @@ function got_mod_rewrite() {
         * This filter was previously used to force URL rewriting for other servers,
         * like nginx. Use the got_url_rewrite filter in got_url_rewrite() instead.
         *
         * This filter was previously used to force URL rewriting for other servers,
         * like nginx. Use the got_url_rewrite filter in got_url_rewrite() instead.
         *

+        * @since 2.5.0
+        *

         * @see got_url_rewrite()
         *
         * @see got_url_rewrite()
         *

-        * @since 2.5.0

         * @param bool $got_rewrite Whether Apache and mod_rewrite are present.
         */
        return apply_filters( 'got_rewrite', $got_rewrite );
         * @param bool $got_rewrite Whether Apache and mod_rewrite are present.
         */
        return apply_filters( 'got_rewrite', $got_rewrite );


@@ -46,6 +47,7 @@ function got_url_rewrite() {
         * Filter whether URL rewriting is available.
         *
         * @since 3.7.0
         * Filter whether URL rewriting is available.
         *
         * @since 3.7.0

+        *

         * @param bool $got_url_rewrite Whether URL rewriting is available.
         */
        return apply_filters( 'got_url_rewrite', $got_url_rewrite );
         * @param bool $got_url_rewrite Whether URL rewriting is available.
         */
        return apply_filters( 'got_url_rewrite', $got_url_rewrite );


@@ -56,8 +58,8 @@ function got_url_rewrite() {
  *
  * @since 1.5.0
  *
  *
  * @since 1.5.0
  *

- * @param unknown_type $filename
- * @param unknown_type $marker
+ * @param string $filename
+ * @param string $marker

  * @return array An array of strings from a file (.htaccess ) from between BEGIN and END markers.
  */
 function extract_from_markers( $filename, $marker ) {
  * @return array An array of strings from a file (.htaccess ) from between BEGIN and END markers.
  */
 function extract_from_markers( $filename, $marker ) {


@@ -92,9 +94,9 @@ function extract_from_markers( $filename, $marker ) {
  *
  * @since 1.5.0
  *
  *
  * @since 1.5.0
  *

- * @param unknown_type $filename
- * @param unknown_type $marker
- * @param unknown_type $insertion
+ * @param string $filename
+ * @param string $marker
+ * @param array  $insertion

  * @return bool True on write success, false on failure.
  */
 function insert_with_markers( $filename, $marker, $insertion ) {
  * @return bool True on write success, false on failure.
  */
 function insert_with_markers( $filename, $marker, $insertion ) {


@@ -161,8 +163,10 @@ function save_mod_rewrite_rules() {
        $home_path = get_home_path();
        $htaccess_file = $home_path.'.htaccess';
 
        $home_path = get_home_path();
        $htaccess_file = $home_path.'.htaccess';
 

-       // If the file doesn't already exist check for write access to the directory and whether we have some rules.
-       // else check for write access to the file.
+       /*
+        * If the file doesn't already exist check for write access to the directory
+        * and whether we have some rules. Else check for write access to the file.
+        */

        if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
                if ( got_mod_rewrite() ) {
                        $rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() );
        if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
                if ( got_mod_rewrite() ) {
                        $rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() );


@@ -207,7 +211,7 @@ function iis7_save_url_rewrite_rules(){
  *
  * @since 1.5.0
  *
  *
  * @since 1.5.0
  *

- * @param unknown_type $file
+ * @param string $file

  */
 function update_recently_edited( $file ) {
        $oldfiles = (array ) get_option( 'recently_edited' );
  */
 function update_recently_edited( $file ) {
        $oldfiles = (array ) get_option( 'recently_edited' );


@@ -272,17 +276,15 @@ function url_shorten( $url ) {
  * @param array $vars An array of globals to reset.
  */
 function wp_reset_vars( $vars ) {
  * @param array $vars An array of globals to reset.
  */
 function wp_reset_vars( $vars ) {

-       for ( $i=0; $i<count( $vars ); $i += 1 ) {
-               $var = $vars[$i];
-               global $$var;
-
-               if ( empty( $_POST[$var] ) ) {
-                       if ( empty( $_GET[$var] ) )
-                               $$var = '';
-                       else
-                               $$var = $_GET[$var];
+       foreach ( $vars as $var ) {
+               if ( empty( $_POST[ $var ] ) ) {
+                       if ( empty( $_GET[ $var ] ) ) {
+                               $GLOBALS[ $var ] = '';
+                       } else {
+                               $GLOBALS[ $var ] = $_GET[ $var ];
+                       }

                } else {
                } else {

-                       $$var = $_POST[$var];
+                       $GLOBALS[ $var ] = $_POST[ $var ];

                }
        }
 }
                }
        }
 }


@@ -292,7 +294,7 @@ function wp_reset_vars( $vars ) {
  *
  * @since 2.1.0
  *
  *
  * @since 2.1.0
  *

- * @param unknown_type $message
+ * @param string|WP_Error $message

  */
 function show_message($message) {
        if ( is_wp_error($message) ){
  */
 function show_message($message) {
        if ( is_wp_error($message) ){


@@ -336,11 +338,11 @@ function wp_doc_link_parse( $content ) {
        sort( $functions );
 
        /**
        sort( $functions );
 
        /**

-        * Filter the list of functions/classes to be ignored from the documentation lookup.
+        * Filter the list of functions and classes to be ignored from the documentation lookup.

         *
         * @since 2.8.0
         *
         *
         * @since 2.8.0
         *

-        * @param array $ignore_functions Functions/Classes to be ignored.
+        * @param array $ignore_functions Functions and classes to be ignored.

         */
        $ignore_functions = apply_filters( 'documentation_ignore_functions', $ignore_functions );
 
         */
        $ignore_functions = apply_filters( 'documentation_ignore_functions', $ignore_functions );
 


@@ -619,7 +621,7 @@ function admin_color_scheme_picker( $user_id ) {
                        <div class="color-option <?php echo ( $color == $current_color ) ? 'selected' : ''; ?>">
                                <input name="admin_color" id="admin_color_<?php echo esc_attr( $color ); ?>" type="radio" value="<?php echo esc_attr( $color ); ?>" class="tog" <?php checked( $color, $current_color ); ?> />
                                <input type="hidden" class="css_url" value="<?php echo esc_url( $color_info->url ); ?>" />
                        <div class="color-option <?php echo ( $color == $current_color ) ? 'selected' : ''; ?>">
                                <input name="admin_color" id="admin_color_<?php echo esc_attr( $color ); ?>" type="radio" value="<?php echo esc_attr( $color ); ?>" class="tog" <?php checked( $color, $current_color ); ?> />
                                <input type="hidden" class="css_url" value="<?php echo esc_url( $color_info->url ); ?>" />

-                               <input type="hidden" class="icon_colors" value="<?php echo esc_attr( json_encode( array( 'icons' => $color_info->icon_colors ) ) ); ?>" />
+                               <input type="hidden" class="icon_colors" value="<?php echo esc_attr( wp_json_encode( array( 'icons' => $color_info->icon_colors ) ) ); ?>" />

                                <label for="admin_color_<?php echo esc_attr( $color ); ?>"><?php echo esc_html( $color_info->name ); ?></label>
                                <table class="color-palette">
                                        <tr>
                                <label for="admin_color_<?php echo esc_attr( $color ); ?>"><?php echo esc_html( $color_info->name ); ?></label>
                                <table class="color-palette">
                                        <tr>


@@ -663,7 +665,7 @@ function wp_color_scheme_settings() {
                $icon_colors = array( 'base' => '#999', 'focus' => '#2ea2cc', 'current' => '#fff' );
        }
 
                $icon_colors = array( 'base' => '#999', 'focus' => '#2ea2cc', 'current' => '#fff' );
        }
 

-       echo '<script type="text/javascript">var _wpColorScheme = ' . json_encode( array( 'icons' => $icon_colors ) ) . ";</script>\n";
+       echo '<script type="text/javascript">var _wpColorScheme = ' . wp_json_encode( array( 'icons' => $icon_colors ) ) . ";</script>\n";

 }
 add_action( 'admin_head', 'wp_color_scheme_settings' );
 
 }
 add_action( 'admin_head', 'wp_color_scheme_settings' );
 


@@ -802,7 +804,7 @@ add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
 /**
  * Autosave with heartbeat
  *
 /**
  * Autosave with heartbeat
  *

- * @since 3.9
+ * @since 3.9.0

  */
 function heartbeat_autosave( $response, $data ) {
        if ( ! empty( $data['wp_autosave'] ) ) {
  */
 function heartbeat_autosave( $response, $data ) {
        if ( ! empty( $data['wp_autosave'] ) ) {


@@ -824,3 +826,20 @@ function heartbeat_autosave( $response, $data ) {
 }
 // Run later as we have to set DOING_AUTOSAVE for back-compat
 add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 );
 }
 // Run later as we have to set DOING_AUTOSAVE for back-compat
 add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 );

+
+/**
+ * Disables autocomplete on the 'post' form (Add/Edit Post screens) for WebKit browsers,
+ * as they disregard the autocomplete setting on the editor textarea. That can break the editor
+ * when the user navigates to it with the browser's Back button. See #28037
+ *
+ * @since 4.0
+ */
+function post_form_autocomplete_off() {
+       global $is_safari, $is_chrome;
+
+       if ( $is_safari || $is_chrome ) {
+               echo ' autocomplete="off"';
+       }
+}
+
+add_action( 'post_edit_form_tag', 'post_form_autocomplete_off' );