Changeset 480

Timestamp:

10/16/2006 05:09:20 PM (20 years ago)

Author:

mdawaffe

Message:

View link issues on front page. Fixes #443

Location:

trunk

Files:

• bb-includes/functions.php (modified) (1 diff)
• bb-includes/template-functions.php (modified) (2 diffs)
• bb-templates/front-page.php (modified) (1 diff)

trunk/bb-includes/functions.php

@@ -1391 +1391 @@
 function get_views( $cache = true ) {
     global $bb_current_user, $views;
-    if ( !isset($views) || !$cache )
-        $views = array('no-replies' => __('Topics with no replies'), 'untagged' => __('Topics with no tags'), 'unresolved' => __('Unresolved topics'));
+    if ( isset($views) && $cache )
+        return $views;
+    $views = array('no-replies' => __('Topics with no replies'), 'untagged' => __('Topics with no tags'), 'unresolved' => __('Unresolved topics'));
     return apply_filters('bb_views', $views);
 }

trunk/bb-includes/template-functions.php

@@ -1256 +1256 @@
 
 //VIEWS
-function view_name() {
+function view_name() { // Filtration should be done at get_views() level
+    echo get_view_name();
+}
+
+function get_view_name() {
     global $view;
     $views = get_views();
@@ -1267 +1271 @@
 }
 
-function get_view_link( $view, $page = 1 ) {
+function view_link( $_view = false, $page = 1 ) {
+    echo get_view_link( $_view, $page );
+}
+
+function get_view_link( $_view = false, $page = 1 ) {
+    global $view;
+    if ( $_view )
+        $v =& $_view;
+    else
+        $v =& $view;
     $views = get_views();
-    if ( !array_key_exists($view, $views) )
+    if ( !array_key_exists($v, $views) )
         return bb_get_option('uri');
     if ( bb_get_option('mod_rewrite') )
-        $link = bb_get_option('uri') . 'view/' . $view . ( 1 < $page ? "/page/$page" : '' );
-    else
-        $link = bb_get_option('uri') . "view.php?view=$view" . ( 1 < $page ? "&page=$page" : '');
-
-    return apply_filters( 'get_view_link', $link, $view, $page );
+        $link = bb_get_option('uri') . 'view/' . $v . ( 1 < $page ? "/page/$page" : '' );
+    else
+        $link = bb_get_option('uri') . "view.php?view=$v" . ( 1 < $page ? "&page=$page" : '');
+
+    return apply_filters( 'get_view_link', $link, $v, $page );
 }
 ?>

trunk/bb-templates/front-page.php

@@ -64 +64 @@
 <ul id="views">
 <?php foreach ( get_views() as $view => $title ) : ?>
-<li class="view"><a href="<?php echo get_view_link($view); ?>"><?php echo $view; ?></a></li>
+<li class="view"><a href="<?php view_link(); ?>"><?php view_name(); ?></a></li>
 <?php endforeach; ?>
 </ul>