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

Timestamp:

05/03/2010 06:16:22 PM (16 years ago)

Author:

ryan

Message:

Revert [14347] and [14372]. It broke more than we expected. Try again in 3.1. see #13051

File:

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

trunk/wp-includes/link-template.php

@@ -785 +785 @@
                 return;
 
+        if ( 'display' == $context )
+                $action = '&action=edit';
+        else
+                $action = '&action=edit';
+
         $post_type_object = get_post_type_object( $post->post_type );
         if ( !$post_type_object )
@@ -792 +797 @@
                 return;
 
-        $url = admin_url( sprintf($post_type_object->_edit_link, $post->ID) );
-
-        if ( 'display' == $context )
-                $url .= '&action=edit';
-        else
-                $url .= '&action=edit'; 
-
-        return apply_filters( 'get_edit_post_link', $url , $post->ID, $context );
+        return apply_filters( 'get_edit_post_link', admin_url( sprintf($post_type_object->_edit_link . $action, $post->ID) ), $post->ID, $context );
 }
 
@@ -1827 +1825 @@
  * @return string Home url link with optional path appended.
 */
-function home_url( $path = '', $scheme = null, $esc_url = true ) {
-        return get_home_url(null, $path, $scheme, $esc_url);
+function home_url( $path = '', $scheme = null ) {
+        return get_home_url(null, $path, $scheme);
 }
 
@@ -1846 +1844 @@
  * @return string Home url link with optional path appended.
 */
-function get_home_url( $blog_id = null, $path = '', $scheme = null, $esc_url = true ) {
+function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
         $orig_scheme = $scheme;
 
@@ -1862 +1860 @@
                 $url .= '/' . ltrim( $path, '/' );
 
-        $url = apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id );
-
-        if ( $esc_url )
-                $url = esc_url($url);
-
-        return $url;
+        return apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id );
 }
 
@@ -1886 +1879 @@
  * @return string Site url link with optional path appended.
 */
-function site_url( $path = '', $scheme = null, $esc_url = true ) {
-        return get_site_url(null, $path, $scheme, $esc_url);
+function site_url( $path = '', $scheme = null ) {
+        return get_site_url(null, $path, $scheme);
 }
 
@@ -1905 +1898 @@
  * @return string Site url link with optional path appended.
 */
-function get_site_url( $blog_id = null, $path = '', $scheme = null, $esc_url = true ) {
+function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
         // should the list of allowed schemes be maintained elsewhere?
         $orig_scheme = $scheme;
@@ -1929 +1922 @@
                 $url .= '/' . ltrim($path, '/');
 
-        $url = apply_filters('site_url', $url, $path, $orig_scheme, $blog_id);
-
-        if ( $esc_url )
-                $url = esc_url($url);
-
-        return $url;
+        return apply_filters('site_url', $url, $path, $orig_scheme, $blog_id);
 }
 
@@ -1947 +1935 @@
  * @return string Admin url link with optional path appended
 */
-function admin_url( $path = '', $scheme = 'admin', $esc_url = true ) {
-        return get_admin_url(null, $path, $scheme, $esc_url);
+function admin_url( $path = '', $scheme = 'admin' ) {
+        return get_admin_url(null, $path, $scheme);
 }
 
@@ -1962 +1950 @@
  * @return string Admin url link with optional path appended
 */
-function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin', $esc_url = true ) {
+function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
         $url = get_site_url($blog_id, 'wp-admin/', $scheme);
 
@@ -1968 +1956 @@
                 $url .= ltrim($path, '/');
 
-        $url = apply_filters('admin_url', $url, $path, $blog_id);
-
-        if ( $esc_url )
-                $url = esc_url($url);
-
-        return $url;
+        return apply_filters('admin_url', $url, $path, $blog_id);
 }
 
@@ -1985 +1968 @@
  * @return string Includes url link with optional path appended.
 */
-function includes_url($path = '', $esc_url = true) {
+function includes_url($path = '') {
         $url = site_url() . '/' . WPINC . '/';
 
@@ -1991 +1974 @@
                 $url .= ltrim($path, '/');
 
-        $url = apply_filters('includes_url', $url, $path);
-
-        if ( $esc_url )
-                $url = esc_url($url);
-
-        return $url;
+        return apply_filters('includes_url', $url, $path);
 }
 
@@ -2008 +1986 @@
  * @return string Content url link with optional path appended.
 */
-function content_url($path = '', $esc_url = true) {
+function content_url($path = '') {
         $url = WP_CONTENT_URL;
         if ( 0 === strpos($url, 'http') && is_ssl() )
@@ -2016 +1994 @@
                 $url .= '/' . ltrim($path, '/');
 
-        $url = apply_filters('content_url', $url, $path);
-
-        if ( $esc_url )
-                $url = esc_url($url);
-
-        return $url;
+        return apply_filters('content_url', $url, $path);
 }
 
@@ -2035 +2008 @@
  * @return string Plugins url link with optional path appended.
 */
-function plugins_url($path = '', $plugin = '', $esc_url = true) {
+function plugins_url($path = '', $plugin = '') {
 
         $mu_plugin_dir = WPMU_PLUGIN_DIR;
@@ -2060 +2033 @@
                 $url .= '/' . ltrim($path, '/');
 
-        $url = apply_filters('plugins_url', $url, $path, $plugin);
-
-        if ( $esc_url )
-                $url = esc_url($url);
-
-        return $url;
-
+        return apply_filters('plugins_url', $url, $path, $plugin);
 }
 
@@ -2083 +2050 @@
  * @return string Site url link with optional path appended.
 */
-function network_site_url( $path = '', $scheme = null, $esc_url = true ) {
+function network_site_url( $path = '', $scheme = null ) {
         global $current_site;
 
@@ -2108 +2075 @@
                 $url .= ltrim($path, '/');
 
-        $url = apply_filters('network_site_url', $url, $path, $orig_scheme);
-
-        if ( $esc_url )
-                $url = esc_url($url);
-
-        return $url;
+        return apply_filters('network_site_url', $url, $path, $orig_scheme);
 }
 
@@ -2130 +2092 @@
  * @return string Home url link with optional path appended.
 */
-function network_home_url( $path = '', $scheme = null, $esc_url = true ) {
+function network_home_url( $path = '', $scheme = null ) {
         global $current_site;
 
@@ -2148 +2110 @@
                 $url .= ltrim( $path, '/' );
 
-        $url = apply_filters( 'network_home_url', $url, $path, $orig_scheme);
-
-        if ( $esc_url )
-                $url = esc_url($url);
-
-        return $url;
+        return apply_filters( 'network_home_url', $url, $path, $orig_scheme);
 }
 
@@ -2166 +2123 @@
  * @return string Admin url link with optional path appended
 */
-function network_admin_url( $path = '', $scheme = 'admin', $esc_url = true ) {
+function network_admin_url( $path = '', $scheme = 'admin' ) {
         $url = network_site_url('wp-admin/', $scheme);
 
@@ -2172 +2129 @@
                 $url .= ltrim($path, '/');
 
-        $url = apply_filters('network_admin_url', $url, $path);
-
-        if ( $esc_url )
-                $url = esc_url($url);
-
-        return $url;
+        return apply_filters('network_admin_url', $url, $path);
 }