Changeset 14347 for trunk/wp-includes/link-template.php

Timestamp:

05/02/2010 10:53:59 PM (15 years ago)

Author:

ryan

Message:

Escape links by default. Props alexkingorg. see #13051

File:

• trunk/wp-includes/link-template.php (modified) (21 diffs)

trunk/wp-includes/link-template.php

@@ -1825 +1825 @@
  * @return string Home url link with optional path appended.
 */
-function home_url( $path = '', $scheme = null ) {
-    return get_home_url(null, $path, $scheme);
+function home_url( $path = '', $scheme = null, $esc_url = true ) {
+    return get_home_url(null, $path, $scheme, $esc_url);
 }
 
@@ -1844 +1844 @@
  * @return string Home url link with optional path appended.
 */
-function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
+function get_home_url( $blog_id = null, $path = '', $scheme = null, $esc_url = true ) {
     $orig_scheme = $scheme;
 
@@ -1860 +1860 @@
         $url .= '/' . ltrim( $path, '/' );
 
-    return apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id );
+    $url = apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id );
+
+    if ( $esc_url )
+        $url = esc_url($url);
+
+    return $url;
 }
 
@@ -1879 +1884 @@
  * @return string Site url link with optional path appended.
 */
-function site_url( $path = '', $scheme = null ) {
-    return get_site_url(null, $path, $scheme);
+function site_url( $path = '', $scheme = null, $esc_url = true ) {
+    return get_site_url(null, $path, $scheme, $esc_url);
 }
 
@@ -1898 +1903 @@
  * @return string Site url link with optional path appended.
 */
-function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
+function get_site_url( $blog_id = null, $path = '', $scheme = null, $esc_url = true ) {
     // should the list of allowed schemes be maintained elsewhere?
     $orig_scheme = $scheme;
@@ -1922 +1927 @@
         $url .= '/' . ltrim($path, '/');
 
-    return apply_filters('site_url', $url, $path, $orig_scheme, $blog_id);
+    $url = apply_filters('site_url', $url, $path, $orig_scheme, $blog_id);
+
+    if ( $esc_url )
+        $url = esc_url($url);
+
+    return $url;
 }
 
@@ -1935 +1945 @@
  * @return string Admin url link with optional path appended
 */
-function admin_url( $path = '', $scheme = 'admin' ) {
-    return get_admin_url(null, $path, $scheme);
+function admin_url( $path = '', $scheme = 'admin', $esc_url = true ) {
+    return get_admin_url(null, $path, $scheme, $esc_url);
 }
 
@@ -1950 +1960 @@
  * @return string Admin url link with optional path appended
 */
-function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
+function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin', $esc_url = true ) {
     $url = get_site_url($blog_id, 'wp-admin/', $scheme);
 
@@ -1956 +1966 @@
         $url .= ltrim($path, '/');
 
-    return apply_filters('admin_url', $url, $path, $blog_id);
+    $url = apply_filters('admin_url', $url, $path, $blog_id);
+
+    if ( $esc_url )
+        $url = esc_url($url);
+
+    return $url;
 }
 
@@ -1968 +1983 @@
  * @return string Includes url link with optional path appended.
 */
-function includes_url($path = '') {
+function includes_url($path = '', $esc_url = true) {
     $url = site_url() . '/' . WPINC . '/';
 
@@ -1974 +1989 @@
         $url .= ltrim($path, '/');
 
-    return apply_filters('includes_url', $url, $path);
+    $url = apply_filters('includes_url', $url, $path);
+
+    if ( $esc_url )
+        $url = esc_url($url);
+
+    return $url;
 }
 
@@ -1986 +2006 @@
  * @return string Content url link with optional path appended.
 */
-function content_url($path = '') {
+function content_url($path = '', $esc_url = true) {
     $url = WP_CONTENT_URL;
     if ( 0 === strpos($url, 'http') && is_ssl() )
@@ -1994 +2014 @@
         $url .= '/' . ltrim($path, '/');
 
-    return apply_filters('content_url', $url, $path);
+    $url = apply_filters('content_url', $url, $path);
+
+    if ( $esc_url )
+        $url = esc_url($url);
+
+    return $url;
 }
 
@@ -2008 +2033 @@
  * @return string Plugins url link with optional path appended.
 */
-function plugins_url($path = '', $plugin = '') {
+function plugins_url($path = '', $plugin = '', $esc_url = true) {
 
     $mu_plugin_dir = WPMU_PLUGIN_DIR;
@@ -2033 +2058 @@
         $url .= '/' . ltrim($path, '/');
 
-    return apply_filters('plugins_url', $url, $path, $plugin);
+    $url = apply_filters('plugins_url', $url, $path, $plugin);
+
+    if ( $esc_url )
+        $url = esc_url($url);
+
+    return $url;
+
 }
 
@@ -2050 +2081 @@
  * @return string Site url link with optional path appended.
 */
-function network_site_url( $path = '', $scheme = null ) {
+function network_site_url( $path = '', $scheme = null, $esc_url = true ) {
     global $current_site;
 
@@ -2075 +2106 @@
         $url .= ltrim($path, '/');
 
-    return apply_filters('network_site_url', $url, $path, $orig_scheme);
+    $url = apply_filters('network_site_url', $url, $path, $orig_scheme);
+
+    if ( $esc_url )
+        $url = esc_url($url);
+
+    return $url;
 }
 
@@ -2092 +2128 @@
  * @return string Home url link with optional path appended.
 */
-function network_home_url( $path = '', $scheme = null ) {
+function network_home_url( $path = '', $scheme = null, $esc_url = true ) {
     global $current_site;
 
@@ -2110 +2146 @@
         $url .= ltrim( $path, '/' );
 
-    return apply_filters( 'network_home_url', $url, $path, $orig_scheme);
+    $url = apply_filters( 'network_home_url', $url, $path, $orig_scheme);
+
+    if ( $esc_url )
+        $url = esc_url($url);
+
+    return $url;
 }
 
@@ -2123 +2164 @@
  * @return string Admin url link with optional path appended
 */
-function network_admin_url( $path = '', $scheme = 'admin' ) {
+function network_admin_url( $path = '', $scheme = 'admin', $esc_url = true ) {
     $url = network_site_url('wp-admin/', $scheme);
 
@@ -2129 +2170 @@
         $url .= ltrim($path, '/');
 
-    return apply_filters('network_admin_url', $url, $path);
+    $url = apply_filters('network_admin_url', $url, $path);
+
+    if ( $esc_url )
+        $url = esc_url($url);
+
+    return $url;
 }