Changeset 46105

Timestamp:

09/13/2019 10:19:34 PM (5 years ago)

Author:

jorbin

Message:

GENERAL: Remove magic quote functions

The path to magic quote sanity took a fun and exciting turn: PHP core removed it and WordPress updated the minimum version.

For the formally external pclzip, the code is commented out to make investigating easier and in case we ever need to merge upstream (if that still exists) changes.

Props ayeshrajans, jrf, jorbin.
See #47783.
Fixes #18322.

Location:

trunk/src

Files:

• wp-admin/includes/class-pclzip.php (modified) (4 diffs)
• wp-includes/formatting.php (modified) (3 diffs)
• wp-includes/load.php (modified) (1 diff)
• wp-includes/rest-api/class-wp-rest-request.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-pclzip.php

@@ -5327 +5327 @@
     $v_result=1;
 
+    // EDIT for WordPress 5.3.0
+    // magic_quote functions are deprecated in PHP 7.4, now assuming it's always off.
+    /*
+
     // ----- Look if function exists
     if (   (!function_exists("get_magic_quotes_runtime"))
@@ -5345 +5349 @@
       @set_magic_quotes_runtime(0);
     }
+    */
 
     // ----- Return
@@ -5360 +5365 @@
   {
     $v_result=1;
+
+    // EDIT for WordPress 5.3.0
+    // magic_quote functions are deprecated in PHP 7.4, now assuming it's always off.
+    /*
 
     // ----- Look if function exists
@@ -5377 +5386 @@
     }
 
+    */
     // ----- Return
     return $v_result;

trunk/src/wp-includes/formatting.php

@@ -2714 +2714 @@
  */
 function addslashes_gpc( $gpc ) {
-    if ( get_magic_quotes_gpc() ) {
-        $gpc = stripslashes( $gpc );
-    }
-
     return wp_slash( $gpc );
 }
@@ -4783 +4779 @@
  * Parses a string into variables to be stored in an array.
  *
- * Uses {@link https://secure.php.net/parse_str parse_str()} and stripslashes if
- * {@link https://secure.php.net/magic_quotes magic_quotes_gpc} is on.
  *
  * @since 2.2.1
@@ -4793 +4787 @@
 function wp_parse_str( $string, &$array ) {
     parse_str( $string, $array );
-    if ( get_magic_quotes_gpc() ) {
-        $array = stripslashes_deep( $array );
-    }
+
     /**
      * Filters the array of variables derived from a parsed string.

trunk/src/wp-includes/load.php

@@ -926 +926 @@
  */
 function wp_magic_quotes() {
-    // If already slashed, strip.
-    if ( get_magic_quotes_gpc() ) {
-        $_GET    = stripslashes_deep( $_GET );
-        $_POST   = stripslashes_deep( $_POST );
-        $_COOKIE = stripslashes_deep( $_COOKIE );
-    }
-
     // Escape with wpdb.
     $_GET    = add_magic_quotes( $_GET );

trunk/src/wp-includes/rest-api/class-wp-rest-request.php

@@ -691 +691 @@
 
         /*
-         * Amazingly, parse_str follows magic quote rules. Sigh.
-         *
-         * NOTE: Do not refactor to use `wp_unslash`.
-         */
-        if ( get_magic_quotes_gpc() ) {
-            $params = stripslashes_deep( $params );
-        }
-
-        /*
          * Add to the POST parameters stored internally. If a user has already
          * set these manually (via `set_body_params`), don't override them.