Changeset 4012 for trunk/bp-forums/bp-forums-template.php

Timestamp:

02/02/2011 08:52:58 AM (14 years ago)

Author:

johnjamesjacoby

Message:

First pass at introducing forums directory, single forum, and single topic views. This is mostly copy/paste from groups component with some rough logic in place to display the proper screens. More to do here.

File:

• trunk/bp-forums/bp-forums-template.php (modified) (4 diffs)

trunk/bp-forums/bp-forums-template.php

@@ -449 +449 @@
 
         $defaults = array(
-            'type' => 'thumb',
-            'width' => false,
+            'type'   => 'thumb',
+            'width'  => false,
             'height' => false,
-            'alt' => __( 'Profile picture of %s', 'buddypress' )
+            'alt'    => __( 'Profile picture of %s', 'buddypress' )
         );
 
@@ -565 +565 @@
             $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/' . bp_current_item() );
         else
-            $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/' . $bp->current_action );
+            $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() );
 
         return apply_filters( 'bp_get_the_topic_permalink', trailingslashit( $permalink . 'topic/' . $forum_template->topic->topic_slug ) );
@@ -901 +901 @@
     if ( empty( $topic_id ) && bp_is_current_component( 'groups') && bp_is_current_action( 'forum' ) && 'topic' == $bp->action_variables[0] )
         $topic_id = bp_forums_get_topic_id_from_slug( $bp->action_variables[1] );
+    elseif ( empty( $topic_id ) && bp_is_current_component( 'forums') && bp_is_current_action( 'topic' ) && !empty( $bp->action_variables[0] ) )
+        $topic_id = bp_forums_get_topic_id_from_slug( $bp->action_variables[0] );
 
     if ( is_numeric( $topic_id ) ) {
@@ -1107 +1109 @@
 }
 
-function bp_forum_permalink() {
-    echo bp_get_forum_permalink();
-}
-    function bp_get_forum_permalink() {
-        global $bp;
-
-        if ( $bp->is_single_item )
-            $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . bp_current_item() );
+function bp_forum_permalink( $forum_id = 0 ) {
+    echo bp_get_forum_permalink( $forum_id );
+}
+    function bp_get_forum_permalink( $forum_id = 0 ) {
+        global $bp;
+
+        if ( bp_is_groups_component() ) {
+            $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . bp_current_item() . 'forum' );
+        } else {
+            if ( empty( $forum_id ) ) {
+                global $topic_template;
+                if ( isset( $topic_template->forum_id ) )
+                    $forum_id = $topic_template->forum_id;
+            }
+
+            if ( $forum = bp_forums_get_forum( $forum_id ) )
+                $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/forum/' . $forum->forum_slug );
+            else
+                return false;
+        }
+
+        return apply_filters( 'bp_get_forum_permalink', trailingslashit( $permalink ) );
+    }
+
+function bp_forum_name( $forum_id = 0 ) {
+    echo bp_get_forum_name( $forum_id );
+}
+    function bp_get_forum_name( $forum_id = 0 ) {
+        global $bp;
+
+        if ( empty( $forum_id ) ) {
+            global $topic_template;
+            if ( isset( $topic_template->forum_id ) )
+                $forum_id = $topic_template->forum_id;
+        }
+
+        if ( $forum = bp_forums_get_forum( $forum_id ) )
+            return apply_filters( 'bp_get_forum_name', $forum->forum_name, $forum->forum_id );
         else
-            $permalink = trailingslashit( bp_get_root_domain() . $bp->current_component . '/' . $bp->current_action );
-
-        return apply_filters( 'bp_get_forum_permalink', trailingslashit( $permalink . 'forum' ) );
+            return false;
     }