Ticket #1227: 1277.diff

bb-admin/options-reading.php

@@ -1 +1 @@
 <?php
 
-require_once('admin.php');
+require_once( 'admin.php' );
 
 if ( 'post' == strtolower( $_SERVER['REQUEST_METHOD'] ) && $_POST['action'] == 'update') {
         
@@ -24 +24 @@
         exit;
 }
 
-if ( !empty($_GET['updated']) ) {
-        bb_admin_notice( __( '<strong>Settings saved.</strong>' ) );
-}
+if ( !empty( $_GET['updated'] ) )
+        bb_admin_notice( '<strong>' . __( 'Settings saved.' ) . '</strong>' );
 
 $reading_options = array(
         'page_topics' => array(
                 'title' => __( 'Items per page' ),
                 'class' => 'short',
-                'note' => __( 'Number of topics, posts or tags to show per page.' ),
+                'note' => __( 'Number of topics, posts or tags to show per page.' )
+        ),
+        'name_link_profile' => array(
+                'title' => __( 'Link name to' ),
+                'type' => 'radio',
+                'options' => array(
+                        0 => __( 'Website' ),
+                        1 => __( 'Profile' )
+                ),
+                'note' => __( 'What should the user\'s name link to on the topic page? The user\'s title would automatically get linked to the option you don\'t choose. By default, the user\'s name is linked to his/her website.' )
         )
 );
 
@@ -44 +52 @@
 
 <div class="wrap">
 
-<h2><?php _e('Reading Settings'); ?></h2>
+<h2><?php _e( 'Reading Settings' ); ?></h2>
 <?php do_action( 'bb_admin_notices' ); ?>
 
-<form class="settings" method="post" action="<?php bb_uri('bb-admin/options-reading.php', null, BB_URI_CONTEXT_FORM_ACTION + BB_URI_CONTEXT_BB_ADMIN); ?>">
+<form class="settings" method="post" action="<?php bb_uri( 'bb-admin/options-reading.php', null, BB_URI_CONTEXT_FORM_ACTION + BB_URI_CONTEXT_BB_ADMIN ); ?>">
         <fieldset>
 <?php
 foreach ( $reading_options as $option => $args ) {
@@ -58 +66 @@
         <fieldset class="submit">
                 <?php bb_nonce_field( 'options-reading-update' ); ?>
                 <input type="hidden" name="action" value="update" />
-                <input class="submit" type="submit" name="submit" value="<?php _e('Save Changes') ?>" />
+                <input class="submit" type="submit" name="submit" value="<?php _e( 'Save Changes' ) ?>" />
         </fieldset>
 </form>
 

bb-includes/functions.bb-meta.php

@@ -476 +476 @@
                 'plugin_cookie_paths',
                 'wp_roles_map',
                 'gmt_offset',
-                'timezone_string'
+                'timezone_string',
+                'name_link_profile'
         );
 
         // Check that these aren't already in the cache

bb-includes/functions.bb-template.php

@@ -1754 +1754 @@
 }
 
 function post_author_link( $post_id = 0 ) {
-        if ( $link = get_user_link( get_post_author_id( $post_id ) ) ) {
+        if ( $link = ( bb_get_option( 'name_link_profile' ) ? get_user_profile_link( get_post_author_id( $post_id ) ) : get_user_link( get_post_author_id( $post_id ) ) ) ) {
                 echo '<a href="' . esc_attr( $link ) . '">' . get_post_author( $post_id ) . '</a>';
         } elseif ( $link = bb_get_post_meta( 'pingback_uri' )) {
                 echo '<a href="' . esc_attr( $link ) . '">' . get_post_author( $post_id ) . '</a>';
@@ -2144 +2144 @@
                         $r = __('PingBack');
                 else
                         $r = __('Unregistered'); // This should never happen
-        } else
-                $r = '<a href="' . esc_attr( get_user_profile_link( get_post_author_id( $post_id ) ) ) . '">' . $title . '</a>';
+        } else {
+                if ( $link = bb_get_option( 'name_link_profile' ) ? get_user_link( get_post_author_id( $post_id ) ) : get_user_profile_link( get_post_author_id( $post_id ) ) )
+                        $r = '<a href="' . esc_attr( $link ) . '">' . $title . '</a>';
+                else
+                        $r = $title;
+        }
 
         return apply_filters( 'get_post_author_title_link', $r, get_post_id( $post_id ) );
 }