<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[17460] branches/3.1/wp-includes/formatting.php: Lose create_function()
in links_add_target() and links_add_base_url().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17460">17460</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-02-16 19:24:45 +0000 (Wed, 16 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Lose create_function() in links_add_target() and links_add_base_url(). esc_attr() the target to provide extra coverage for plugins. Props Justin Rainbow, nacin. For 3.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches31wpincludesformattingphp">branches/3.1/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches31wpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/formatting.php (17459 => 17460)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/formatting.php 2011-02-16 19:24:18 UTC (rev 17459)
+++ branches/3.1/wp-includes/formatting.php 2011-02-16 19:24:45 UTC (rev 17460)
</span><span class="lines">@@ -2734,10 +2734,10 @@
</span><span class="cx"> * @return string The processed content.
</span><span class="cx"> */
</span><span class="cx"> function links_add_base_url( $content, $base, $attrs = array('src', 'href') ) {
</span><ins>+ global $_links_add_base;
+ $_links_add_base = $base;
</ins><span class="cx"> $attrs = implode('|', (array)$attrs);
</span><del>- return preg_replace_callback("!($attrs)=(['\"])(.+?)\\2!i",
- create_function('$m', 'return _links_add_base($m, "' . $base . '");'),
- $content);
</del><ins>+ return preg_replace_callback( "!($attrs)=(['\"])(.+?)\\2!i", '_links_add_base', $content );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2747,14 +2747,14 @@
</span><span class="cx"> * @access private
</span><span class="cx"> *
</span><span class="cx"> * @param string $m The matched link.
</span><del>- * @param string $base The base URL to prefix to links.
</del><span class="cx"> * @return string The processed link.
</span><span class="cx"> */
</span><del>-function _links_add_base($m, $base) {
</del><ins>+function _links_add_base($m) {
+ global $_links_add_base;
</ins><span class="cx"> //1 = attribute name 2 = quotation mark 3 = URL
</span><span class="cx"> return $m[1] . '=' . $m[2] .
</span><span class="cx"> (strpos($m[3], 'http://') === false ?
</span><del>- path_join($base, $m[3]) :
</del><ins>+ path_join($_links_add_base, $m[3]) :
</ins><span class="cx"> $m[3])
</span><span class="cx"> . $m[2];
</span><span class="cx"> }
</span><span class="lines">@@ -2775,10 +2775,10 @@
</span><span class="cx"> * @return string The processed content.
</span><span class="cx"> */
</span><span class="cx"> function links_add_target( $content, $target = '_blank', $tags = array('a') ) {
</span><ins>+ global $_links_add_target;
+ $_links_add_target = $target;
</ins><span class="cx"> $tags = implode('|', (array)$tags);
</span><del>- return preg_replace_callback("!<($tags)(.+?)>!i",
- create_function('$m', 'return _links_add_target($m, "' . $target . '");'),
- $content);
</del><ins>+ return preg_replace_callback( "!<($tags)(.+?)>!i", '_links_add_target', $content );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2788,13 +2788,13 @@
</span><span class="cx"> * @access private
</span><span class="cx"> *
</span><span class="cx"> * @param string $m The matched link.
</span><del>- * @param string $target The Target to add to the links.
</del><span class="cx"> * @return string The processed link.
</span><span class="cx"> */
</span><del>-function _links_add_target( $m, $target ) {
</del><ins>+function _links_add_target( $m ) {
+ global $_links_add_target;
</ins><span class="cx"> $tag = $m[1];
</span><span class="cx"> $link = preg_replace('|(target=[\'"](.*?)[\'"])|i', '', $m[2]);
</span><del>- return '<' . $tag . $link . ' target="' . $target . '">';
</del><ins>+ return '<' . $tag . $link . ' target="' . esc_attr( $_links_add_target ) . '">';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // normalize EOL characters and strip duplicate whitespace
</span></span></pre>
</div>
</div>
</body>
</html>