Changeset 5668

Timestamp:

01/29/2012 05:30:10 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Remove unreferenced globals and prevent debug notices in bp-core-template.php.

File:

• trunk/bp-core/bp-core-template.php (modified) (7 diffs)

trunk/bp-core/bp-core-template.php

@@ -1 +1 @@
 <?php
+
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
@@ -244 +245 @@
  * Generates the basic search form as used in BP-Default's header.
  *
- * @global object $bp BuddyPress global settings
  * @return string HTML <select> element
  * @since 1.0
  */
 function bp_search_form_type_select() {
-        global $bp;
 
         $options = array();
@@ -406 +405 @@
 
         // Remove shortcodes if necessary
-        if ( $filter_shortcodes )
+        if ( !empty( $filter_shortcodes ) )
                 $text = strip_shortcodes( $text );
 
         // When $html is true, the excerpt should be created without including HTML tags in the
         // excerpt length
-        if ( $html ) {
+        if ( !empty( $html ) ) {
                 // The text is short enough. No need to truncate
                 if ( mb_strlen( preg_replace( '/<.*?>/', '', $text ) ) <= $length ) {
@@ -471 +470 @@
 
         // If $exact is false, we can't break on words
-        if ( !$exact ) {
+        if ( empty( $exact ) ) {
                 $spacepos = mb_strrpos( $truncate, ' ' );
                 if ( isset( $spacepos ) ) {
@@ -981 +980 @@
  */
 function bp_is_blog_page() {
-        global $wp_query;
 
         $is_blog_page = false;
@@ -1092 +1090 @@
 
 function bp_is_my_profile() {
-        global $bp;
-
         if ( is_user_logged_in() && bp_loggedin_user_id() == bp_displayed_user_id() )
                 $my_profile = true;
@@ -1103 +1099 @@
 
 function bp_is_user() {
-        global $bp;
-
         if ( bp_displayed_user_id() )
                 return true;