Changeset 5686 for trunk/bp-blogs/bp-blogs-template.php

Timestamp:

02/09/2012 10:36:36 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Blogs component. See #3989.

File:

• trunk/bp-blogs/bp-blogs-template.php (modified) (17 diffs)

trunk/bp-blogs/bp-blogs-template.php

@@ -1 +1 @@
 <?php
+
+/**
+ * BuddyPress Blogs Template Tags
+ *
+ * @package BuddyPress
+ * @subpackage BlogsTemplate
+ */
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
@@ -7 +15 @@
  *
  * @package BuddyPress
- * @subpackage Blogs Template
+ * @subpackage BlogsTemplate
  * @since BuddyPress (r4100)
  *
@@ -19 +27 @@
      *
      * @package BuddyPress
-     * @subpackage Blogs Template
+     * @subpackage BlogsTemplate
      * @since BuddyPress (r4100)
      */
@@ -31 +39 @@
  *
  * @package BuddyPress
- * @subpackage Blogs Template
+ * @subpackage BlogsTemplate
  * @since BuddyPress (r4100)
  *
@@ -43 +51 @@
      *
      * @package BuddyPress
-     * @subpackage Blogs Template
+     * @subpackage BlogsTemplate
      * @since BuddyPress (r4100)
      */
@@ -55 +63 @@
  *
  * @package BuddyPress
- * @subpackage Blogs Template
+ * @subpackage BlogsTemplate
  * @since 1.5
  * @uses bp_get_blogs_directory_permalink()
@@ -66 +74 @@
      *
      * @package BuddyPress
-     * @subpackage Blogs Template
+     * @subpackage BlogsTemplate
      * @since 1.5
      * @uses apply_filters()
@@ -100 +108 @@
 
     function __construct( $type, $page, $per_page, $max, $user_id, $search_terms ) {
-        global $bp;
 
         $this->pag_page = isset( $_REQUEST['bpage'] ) ? intval( $_REQUEST['bpage'] ) : $page;
@@ -175 +182 @@
 
     function the_blog() {
-        global $blog;
 
         $this->in_the_loop = true;
@@ -192 +198 @@
 
 function bp_has_blogs( $args = '' ) {
-    global $bp, $blogs_template;
+    global $blogs_template;
 
     /***
@@ -228 +234 @@
 
     if ( $max ) {
-        if ( $per_page > $max )
+        if ( $per_page > $max ) {
             $per_page = $max;
+        }
     }
 
@@ -249 +256 @@
 
 function bp_blogs_pagination_count() {
-    global $bp, $blogs_template;
+    global $blogs_template;
 
     $start_num = intval( ( $blogs_template->pag_page - 1 ) * $blogs_template->pag_num ) + 1;
@@ -272 +279 @@
 }
     function bp_get_blog_avatar( $args = '' ) {
-        global $blogs_template, $bp;
+        global $blogs_template;
         
         $defaults = array(
@@ -402 +409 @@
 
 function bp_show_blog_signup_form($blogname = '', $blog_title = '', $errors = '') {
-    global $current_user, $current_site;
-    global $bp;
+    global $current_user;
 
     if ( isset($_POST['submit']) ) {
@@ -582 +588 @@
 
 function bp_create_blog_link() {
-    global $bp;
-
     if ( bp_is_my_profile() )
         echo apply_filters( 'bp_create_blog_link', '<a href="' . bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/create/">' . __( 'Create a Site', 'buddypress' ) . '</a>' );
@@ -589 +593 @@
 
 function bp_blogs_blog_tabs() {
-    global $bp, $groups_template;
 
     // Don't show these tabs on a user's own profile
@@ -608 +611 @@
 
 function bp_directory_blogs_search_form() {
-    global $bp;
 
     $default_search_value = bp_get_search_default_text();
-    $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value; ?>
+    $search_value         = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value; ?>
 
     <form action="" method="get" id="search-blogs-form">