Changeset 2974

Timestamp:

04/01/2011 04:01:31 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Full audit of user/topic/reply/view permalinks. Use $wp_rewrite->using_permalinks() method in place of $wp_rewrite->permalink_structure. See r2973

Location:

branches/plugin/bbp-includes

Files:

• bbp-general-template.php (modified) (1 diff)
• bbp-reply-template.php (modified) (1 diff)
• bbp-topic-template.php (modified) (1 diff)
• bbp-user-template.php (modified) (3 diffs)

branches/plugin/bbp-includes/bbp-general-template.php

@@ -978 +978 @@
                         return home_url();
 
-                if ( !empty( $wp_rewrite->permalink_structure ) ) {
-                        $url = $wp_rewrite->front . $bbp->view_slug . '/' . $view;
+                // Pretty permalinks
+                if ( $wp_rewrite->using_permalinks() ) {
+                        $url = $wp_rewrite->root . $bbp->view_slug . '/' . $view;
                         $url = home_url( user_trailingslashit( $url ) );
+
+                // Unpretty permalinks
                 } else {
                         $url = add_query_arg( array( 'bbp_view' => $view ), home_url( '/' ) );

branches/plugin/bbp-includes/bbp-reply-template.php

@@ -1323 +1323 @@
                         return;
 
-                if ( empty( $wp_rewrite->permalink_structure ) ) {
+                // Pretty permalinks
+                if ( $wp_rewrite->using_permalinks() ) {
+                        $url = $wp_rewrite->root . $bbp->reply_slug . '/' . $reply->post_name . '/edit';
+                        $url = home_url( user_trailingslashit( $url ) );
+
+                // Unpretty permalinks
+                } else {
                         $url = add_query_arg( array( bbp_get_reply_post_type() => $reply->post_name, 'edit' => '1' ), home_url( '/' ) );
-                } else {
-                        $url = $wp_rewrite->front . $bbp->reply_slug . '/' . $reply->post_name . '/edit';
-                        $url = home_url( user_trailingslashit( $url ) );
                 }
 

branches/plugin/bbp-includes/bbp-topic-template.php

@@ -1904 +1904 @@
                         return;
 
-                if ( empty( $wp_rewrite->permalink_structure ) ) {
+                // Pretty permalinks
+                if ( $wp_rewrite->using_permalinks() ) {
+                        $url = $wp_rewrite->root . $bbp->topic_slug . '/' . $topic->post_name . '/edit';
+                        $url = home_url( user_trailingslashit( $url ) );
+
+                // Unpretty permalinks
+                } else {
                         $url = add_query_arg( array( bbp_get_topic_post_type() => $topic->post_name, 'edit' => '1' ), home_url( '/' ) );
-                } else {
-                        $url = $wp_rewrite->front . $bbp->topic_slug . '/' . $topic->post_name . '/edit';
-                        $url = home_url( user_trailingslashit( $url ) );
                 }
 

branches/plugin/bbp-includes/bbp-user-template.php

@@ -247 +247 @@
          */
         function bbp_get_user_profile_url( $user_id = 0, $user_nicename = '' ) {
-                global $bbp;
+                global $wp_rewrite, $bbp;
 
                 // Use displayed user ID if there is one, and one isn't requested
@@ -253 +253 @@
                         return false;
 
-                // No pretty permalinks
-                if ( empty( $wp_rewrite->permalink_structure ) ) {
-                        $url = add_query_arg( array( 'bbp_user' => $user_id ), home_url( '/' ) );
-
-                // Get URL safe user slug
-                } else {
-                        $url = $bbp->user_slug . '/%bbp_user%';
-
+                // Pretty permalinks
+                if ( $wp_rewrite->using_permalinks() ) {
+                        $url = $wp_rewrite->root . $bbp->user_slug . '/%bbp_user%';
+
+                        // Get username if not passed
                         if ( empty( $user_nicename ) ) {
                                 $user = get_userdata( $user_id );
-                                if ( !empty( $user->user_nicename ) )
+                                if ( !empty( $user->user_nicename ) ) {
                                         $user_nicename = $user->user_nicename;
+                                }
                         }
 
                         $url = str_replace( '%bbp_user%', $user_nicename, $url );
                         $url = home_url( user_trailingslashit( $url ) );
+
+                // Unpretty permalinks
+                } else {
+                        $url = add_query_arg( array( 'bbp_user' => $user_id ), home_url( '/' ) );
                 }
 
@@ -341 +343 @@
                         return;
 
-                if ( empty( $wp_rewrite->permalink_structure ) ) {
-                        $url = add_query_arg( array( 'bbp_user' => $user_id, 'edit' => '1' ), home_url( '/' ) );
-                } else {
-                        $url = $wp_rewrite->front . $bbp->user_slug . '/%bbp_user%/edit';
-
+                // Pretty permalinks
+                if ( $wp_rewrite->using_permalinks() ) {
+                        $url = $wp_rewrite->root . $bbp->user_slug . '/%bbp_user%/edit';
+
+                        // Get username if not passed
                         if ( empty( $user_nicename ) ) {
                                 $user = get_userdata( $user_id );
-                                if ( !empty( $user->user_nicename ) )
+                                if ( !empty( $user->user_nicename ) ) {
                                         $user_nicename = $user->user_nicename;
+                                }
                         }
 
                         $url = str_replace( '%bbp_user%', $user_nicename, $url );
                         $url = home_url( user_trailingslashit( $url ) );
+
+                // Unpretty permalinks
+                } else {
+                        $url = add_query_arg( array( 'bbp_user' => $user_id, 'edit' => '1' ), home_url( '/' ) );
                 }