Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-03 06:57:35 +01:00
Code Issues Projects Releases Wiki Activity

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 trunk

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@17459 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-02-16 19:24:18 +00:00
parent 400dc5312f
commit 4d46e8d95e
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wp-includes/formatting.php
View File

@ -2734,10 +2734,10 @@ function wp_html_excerpt( $str, $count ) {
* @return string The processed content. * @return string The processed content.
*/ */
function links_add_base_url( $content, $base, $attrs = array('src', 'href') ) { function links_add_base_url( $content, $base, $attrs = array('src', 'href') ) {
global $_links_add_base;
$_links_add_base = $base;
$attrs = implode('|', (array)$attrs); $attrs = implode('|', (array)$attrs);
return preg_replace_callback("!($attrs)=(['\"])(.+?)\\2!i", return preg_replace_callback( "!($attrs)=(['\"])(.+?)\\2!i", '_links_add_base', $content );
create_function('$m', 'return _links_add_base($m, "' . $base . '");'),
$content);
} }
/** /**
@ -2747,14 +2747,14 @@ function links_add_base_url( $content, $base, $attrs = array('src', 'href') ) {
* @access private * @access private
* *
* @param string $m The matched link. * @param string $m The matched link.
* @param string $base The base URL to prefix to links.
* @return string The processed link. * @return string The processed link.
*/ */
function _links_add_base($m, $base) { function _links_add_base($m) {
global $_links_add_base;
//1 = attribute name 2 = quotation mark 3 = URL //1 = attribute name 2 = quotation mark 3 = URL
return $m[1] . '=' . $m[2] . return $m[1] . '=' . $m[2] .
(strpos($m[3], 'http://') === false ? (strpos($m[3], 'http://') === false ?
path_join($base, $m[3]) : path_join($_links_add_base, $m[3]) :
$m[3]) $m[3])
. $m[2]; . $m[2];
} }
@ -2775,10 +2775,10 @@ function _links_add_base($m, $base) {
* @return string The processed content. * @return string The processed content.
*/ */
function links_add_target( $content, $target = '_blank', $tags = array('a') ) { function links_add_target( $content, $target = '_blank', $tags = array('a') ) {
global $_links_add_target;
$_links_add_target = $target;
$tags = implode('|', (array)$tags); $tags = implode('|', (array)$tags);
return preg_replace_callback("!<($tags)(.+?)>!i", return preg_replace_callback( "!<($tags)(.+?)>!i", '_links_add_target', $content );
create_function('$m', 'return _links_add_target($m, "' . $target . '");'),
$content);
} }
/** /**
@ -2788,13 +2788,13 @@ function links_add_target( $content, $target = '_blank', $tags = array('a') ) {
* @access private * @access private
* *
* @param string $m The matched link. * @param string $m The matched link.
* @param string $target The Target to add to the links.
* @return string The processed link. * @return string The processed link.
*/ */
function _links_add_target( $m, $target ) { function _links_add_target( $m ) {
global $_links_add_target;
$tag = $m[1]; $tag = $m[1];
$link = preg_replace('|(target=[\'"](.*?)[\'"])|i', '', $m[2]); $link = preg_replace('|(target=[\'"](.*?)[\'"])|i', '', $m[2]);
return '<' . $tag . $link . ' target="' . $target . '">'; return '<' . $tag . $link . ' target="' . esc_attr( $_links_add_target ) . '">';
} }
// normalize EOL characters and strip duplicate whitespace // normalize EOL characters and strip duplicate whitespace