Changeset 8702 for trunk/src/bp-core/bp-core-functions.php

Timestamp:

07/27/2014 05:01:01 PM (12 years ago)

Author:

johnjamesjacoby

Message:

In bp_core_time_since(), move the $pre_check into it's own line, and do an explicit comparison against it.

File:

• trunk/src/bp-core/bp-core-functions.php (modified) (5 diffs)

trunk/src/bp-core/bp-core-functions.php

@@ -705 +705 @@
  *        headers. Default: 302.
  */
-function bp_core_redirect( $location, $status = 302 ) {
+function bp_core_redirect( $location = '', $status = 302 ) {
 
         // On some setups, passing the value of wp_get_referer() may result in an
         // empty value for $location, which results in an error. Ensure that we
         // have a valid URL.
-        if ( empty( $location ) )
+        if ( empty( $location ) ) {
                 $location = bp_get_root_domain();
+        }
 
         // Make sure we don't call status_header() in bp_core_do_catch_uri() as this
@@ -742 +743 @@
         global $current_site;
 
-        if ( is_multisite() )
+        if ( is_multisite() ) {
                 $site_path = $current_site->path;
-        else {
+        } else {
                 $site_path = (array) explode( '/', home_url() );
 
-                if ( count( $site_path ) < 2 )
+                if ( count( $site_path ) < 2 ) {
                         $site_path = '/';
-                else {
+                } else {
                         // Unset the first three segments (http(s)://domain.com part)
                         unset( $site_path[0] );
@@ -755 +756 @@
                         unset( $site_path[2] );
 
-                        if ( !count( $site_path ) )
+                        if ( !count( $site_path ) ) {
                                 $site_path = '/';
-                        else
+                        } else {
                                 $site_path = '/' . implode( '/', $site_path ) . '/';
+                        }
                 }
         }
@@ -778 +780 @@
  */
 function bp_core_current_time( $gmt = true, $type = 'mysql' ) {
-        // Get current time
-        $current_time = current_time( $type, $gmt );
-
-        return apply_filters( 'bp_core_current_time', $current_time );
+        return apply_filters( 'bp_core_current_time', current_time( $type, $gmt ) );
 }
 
@@ -813 +812 @@
 
         // Use this filter to bypass BuddyPress's time_since calculations
-        if ( $pre_value = apply_filters( 'bp_core_time_since_pre', false, $older_date, $newer_date ) ) {
+        $pre_value = apply_filters( 'bp_core_time_since_pre', false, $older_date, $newer_date );
+        if ( false !== $pre_value ) {
                 return $pre_value;
         }