<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[46105] trunk/src: GENERAL: Remove magic quote functions</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/46105">46105</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/46105","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jorbin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-09-13 22:19:34 +0000 (Fri, 13 Sep 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/47783">#47783</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/18322">#18322</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasspclzipphp">trunk/src/wp-admin/includes/class-pclzip.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesrestapiclasswprestrequestphp">trunk/src/wp-includes/rest-api/class-wp-rest-request.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasspclzipphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-pclzip.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-pclzip.php 2019-09-13 18:54:06 UTC (rev 46104)
+++ trunk/src/wp-admin/includes/class-pclzip.php 2019-09-13 22:19:34 UTC (rev 46105)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5326,6 +5326,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> $v_result=1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // EDIT for WordPress 5.3.0
+ // magic_quote functions are deprecated in PHP 7.4, now assuming it's always off.
+ /*
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // ----- Look if function exists
</span><span class="cx" style="display: block; padding: 0 10px"> if ( (!function_exists("get_magic_quotes_runtime"))
</span><span class="cx" style="display: block; padding: 0 10px"> || (!function_exists("set_magic_quotes_runtime"))) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5344,6 +5348,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ($this->magic_quotes_status == 1) {
</span><span class="cx" style="display: block; padding: 0 10px"> @set_magic_quotes_runtime(0);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // ----- Return
</span><span class="cx" style="display: block; padding: 0 10px"> return $v_result;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5360,6 +5365,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> $v_result=1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // EDIT for WordPress 5.3.0
+ // magic_quote functions are deprecated in PHP 7.4, now assuming it's always off.
+ /*
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // ----- Look if function exists
</span><span class="cx" style="display: block; padding: 0 10px"> if ( (!function_exists("get_magic_quotes_runtime"))
</span><span class="cx" style="display: block; padding: 0 10px"> || (!function_exists("set_magic_quotes_runtime"))) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5376,6 +5385,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> @set_magic_quotes_runtime($this->magic_quotes_status);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> // ----- Return
</span><span class="cx" style="display: block; padding: 0 10px"> return $v_result;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2019-09-13 18:54:06 UTC (rev 46104)
+++ trunk/src/wp-includes/formatting.php 2019-09-13 22:19:34 UTC (rev 46105)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2713,10 +2713,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Returns a string escaped with slashes.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function addslashes_gpc( $gpc ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_magic_quotes_gpc() ) {
- $gpc = stripslashes( $gpc );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> return wp_slash( $gpc );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4782,8 +4778,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Parses a string into variables to be stored in an array.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 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.
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.1
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4792,9 +4786,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_parse_str( $string, &$array ) {
</span><span class="cx" style="display: block; padding: 0 10px"> parse_str( $string, $array );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_magic_quotes_gpc() ) {
- $array = stripslashes_deep( $array );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the array of variables derived from a parsed string.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesloadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php 2019-09-13 18:54:06 UTC (rev 46104)
+++ trunk/src/wp-includes/load.php 2019-09-13 22:19:34 UTC (rev 46105)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -925,13 +925,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_magic_quotes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If already slashed, strip.
- if ( get_magic_quotes_gpc() ) {
- $_GET = stripslashes_deep( $_GET );
- $_POST = stripslashes_deep( $_POST );
- $_COOKIE = stripslashes_deep( $_COOKIE );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Escape with wpdb.
</span><span class="cx" style="display: block; padding: 0 10px"> $_GET = add_magic_quotes( $_GET );
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST = add_magic_quotes( $_POST );
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiclasswprestrequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api/class-wp-rest-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/class-wp-rest-request.php 2019-09-13 18:54:06 UTC (rev 46104)
+++ trunk/src/wp-includes/rest-api/class-wp-rest-request.php 2019-09-13 22:19:34 UTC (rev 46105)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,15 +690,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parse_str( $this->get_body(), $params );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 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 );
- }
-
- /*
</del><span class="cx" style="display: block; padding: 0 10px"> * Add to the POST parameters stored internally. If a user has already
</span><span class="cx" style="display: block; padding: 0 10px"> * set these manually (via `set_body_params`), don't override them.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>