Changeset 5829

Timestamp:

07/14/2015 12:46:38 AM (10 years ago)

Author:

johnjamesjacoby

Message:

I think this building should be condemned. There's serious metal fatigue in all the load-bearing members, the wiring is substandard, it's completely inadequate for our power needs, and the neighborhood is like a demilitarized zone.

Location:

trunk/src

Files:

• bbpress.php (modified) (1 diff)
• includes/admin/admin.php (modified) (3 diffs)
• includes/admin/converter.php (modified) (28 diffs)
• includes/admin/converters/e107v1.php (modified) (2 diffs)
• includes/admin/forums.php (modified) (6 diffs)
• includes/admin/functions.php (modified) (1 diff)
• includes/admin/replies.php (modified) (9 diffs)
• includes/admin/settings.php (modified) (2 diffs)
• includes/admin/tools.php (modified) (7 diffs)
• includes/admin/topics.php (modified) (12 diffs)
• includes/common/ajax.php (modified) (1 diff)
• includes/common/classes.php (modified) (4 diffs)
• includes/common/functions.php (modified) (40 diffs)
• includes/common/shortcodes.php (modified) (10 diffs)
• includes/common/template.php (modified) (50 diffs)
• includes/common/widgets.php (modified) (13 diffs)
• includes/core/extend.php (modified) (1 diff)
• includes/core/functions.php (modified) (4 diffs)
• includes/core/template-functions.php (modified) (9 diffs)
• includes/core/template-loader.php (modified) (2 diffs)
• includes/core/theme-compat.php (modified) (4 diffs)
• includes/core/update.php (modified) (4 diffs)
• includes/extend/akismet.php (modified) (7 diffs)
• includes/extend/buddypress/activity.php (modified) (8 diffs)
• includes/extend/buddypress/functions.php (modified) (9 diffs)
• includes/extend/buddypress/groups.php (modified) (11 diffs)
• includes/extend/buddypress/notifications.php (modified) (4 diffs)
• includes/forums/capabilities.php (modified) (3 diffs)
• includes/forums/functions.php (modified) (53 diffs)
• includes/replies/capabilities.php (modified) (3 diffs)
• includes/replies/functions.php (modified) (42 diffs)
• includes/replies/template.php (modified) (12 diffs)
• includes/topics/functions.php (modified) (6 diffs)
• templates/default/bbpress-functions.php (modified) (1 diff)
• templates/default/bbpress/content-single-forum.php (modified) (2 diffs)
• templates/default/bbpress/content-statistics.php (modified) (3 diffs)
• templates/default/bbpress/form-forum.php (modified) (1 diff)
• templates/default/bbpress/form-reply.php (modified) (2 diffs)
• templates/default/bbpress/form-topic.php (modified) (4 diffs)
• templates/default/bbpress/loop-single-topic.php (modified) (1 diff)

trunk/src/bbpress.php

@@ -637 +637 @@
         global $wp_post_statuses;
 
-        if ( !empty( $wp_post_statuses['trash'] ) ) {
+        if ( ! empty( $wp_post_statuses['trash'] ) ) {
 
             // User can view trash so set internal to false

trunk/src/includes/admin/admin.php

@@ -317 +317 @@
      */
     public static function new_install() {
-        if ( !bbp_is_install() ) {
+        if ( ! bbp_is_install() ) {
             return;
         }
@@ -360 +360 @@
 
             // Toggle the section if core integration is on
-            if ( ( true === $settings_integration ) && !empty( $section['page'] ) ) {
+            if ( ( true === $settings_integration ) && ! empty( $section['page'] ) ) {
                 $page = $section['page'];
             } else {
@@ -373 +373 @@
 
                 // Add the field
-                if ( ! empty( $field['callback'] ) && !empty( $field['title'] ) ) {
+                if ( ! empty( $field['callback'] ) && ! empty( $field['title'] ) ) {
                     add_settings_field( $field_id, $field['title'], $field['callback'], $page, $section_id, $field['args'] );
                 }

trunk/src/includes/admin/converter.php

@@ -320 +320 @@
 
         // Save step and count so that it can be restarted.
-        if ( ! get_option( '_bbp_converter_step' ) || ( !empty( $_POST['_bbp_converter_restart'] ) ) ) {
+        if ( ! get_option( '_bbp_converter_step' ) || ( ! empty( $_POST['_bbp_converter_restart'] ) ) ) {
             update_option( '_bbp_converter_step',  1 );
             update_option( '_bbp_converter_start', 0 );
@@ -332 +332 @@
 
         // Bail if platform did not get saved
-        $platform = !empty( $_POST['_bbp_converter_platform' ] ) ? $_POST['_bbp_converter_platform' ] : get_option( '_bbp_converter_platform' );
+        $platform = ! empty( $_POST['_bbp_converter_platform' ] ) ? $_POST['_bbp_converter_platform' ] : get_option( '_bbp_converter_platform' );
         if ( empty( $platform ) ) {
             return;
@@ -344 +344 @@
             // STEP 1. Clean all tables.
             case 1 :
-                if ( !empty( $_POST['_bbp_converter_clean'] ) ) {
+                if ( ! empty( $_POST['_bbp_converter_clean'] ) ) {
                     if ( $converter->clean( $start ) ) {
                         update_option( '_bbp_converter_step',  $step + 1 );
@@ -365 +365 @@
             // STEP 2. Convert users.
             case 2 :
-                if ( !empty( $_POST['_bbp_converter_convert_users'] ) ) {
+                if ( ! empty( $_POST['_bbp_converter_convert_users'] ) ) {
                     if ( $converter->convert_users( $start ) ) {
                         update_option( '_bbp_converter_step',  $step + 1 );
@@ -385 +385 @@
             // STEP 3. Clean passwords.
             case 3 :
-                if ( !empty( $_POST['_bbp_converter_convert_users'] ) ) {
+                if ( ! empty( $_POST['_bbp_converter_convert_users'] ) ) {
                     if ( $converter->clean_passwords( $start ) ) {
                         update_option( '_bbp_converter_step',  $step + 1 );
@@ -639 +639 @@
         require_once( ABSPATH . '/wp-admin/includes/upgrade.php' );
 
-        if ( !empty( $bbp_db->charset ) ) {
+        if ( ! empty( $bbp_db->charset ) ) {
             $charset_collate = "DEFAULT CHARACTER SET $bbp_db->charset";
         }
 
-        if ( !empty( $bbp_db->collate ) ) {
+        if ( ! empty( $bbp_db->collate ) ) {
             $charset_collate .= " COLLATE $bbp_db->collate";
         }
@@ -958 +958 @@
 
         // Get the fields from the destination table
-        if ( !empty( $tablename ) ) {
+        if ( ! empty( $tablename ) ) {
             $tablefield_array = $this->get_fields( $tablename );
         }
@@ -968 +968 @@
 
             // Yay a match, and we have a from table, too
-            if ( ( $item['to_type'] == $to_type ) && !empty( $item['from_tablename'] ) ) {
+            if ( ( $item['to_type'] == $to_type ) && ! empty( $item['from_tablename'] ) ) {
 
                 // $from_tablename was set from a previous loop iteration
@@ -974 +974 @@
 
                     // Doing some joining
-                    if ( !in_array( $item['from_tablename'], $from_tables ) && in_array( $item['join_tablename'], $from_tables ) ) {
+                    if ( ! in_array( $item['from_tablename'], $from_tables ) && in_array( $item['join_tablename'], $from_tables ) ) {
                         $from_tablename .= ' ' . $item['join_type'] . ' JOIN ' . $this->opdb->prefix . $item['from_tablename'] . ' AS ' . $item['from_tablename'] . ' ' . $item['join_expression'];
                     }
@@ -984 +984 @@
 
                 // Specific FROM expression data used
-                if ( !empty( $item['from_expression'] ) ) {
+                if ( ! empty( $item['from_expression'] ) ) {
 
                     // No 'WHERE' in expression
@@ -1005 +1005 @@
 
         // We have a $from_tablename, so we want to get some data to convert
-        if ( !empty( $from_tablename ) ) {
+        if ( ! empty( $from_tablename ) ) {
 
             // Get some data from the old forums
@@ -1016 +1016 @@
 
             // Query returned some results
-            if ( !empty( $forum_array ) ) {
+            if ( ! empty( $forum_array ) ) {
 
                 // Loop through results
@@ -1054 +1054 @@
                             // Destination field is not empty, so we might need
                             // to do some extra work or set a default.
-                            } elseif ( !empty( $row['to_fieldname'] ) ) {
+                            } elseif ( ! empty( $row['to_fieldname'] ) ) {
 
                                 // Allows us to set default fields.
@@ -1252 +1252 @@
         $has_update = false;
 
-        if ( !empty( $this->sync_table ) ) {
+        if ( ! empty( $this->sync_table ) ) {
             $query = 'SELECT value_id, meta_value FROM '            . $this->sync_table_name . ' WHERE meta_key = "_bbp_old_forum_parent_id" AND meta_value > 0 LIMIT ' . $start . ', ' . $this->max_rows;
         } else {
@@ -1284 +1284 @@
         $has_update = false;
 
-        if ( !empty( $this->sync_table ) ) {
+        if ( ! empty( $this->sync_table ) ) {
             $query = 'SELECT value_id, meta_value FROM '            . $this->sync_table_name . ' WHERE meta_key = "_bbp_old_sticky_status_id" AND meta_value = "sticky" LIMIT ' . $start . ', ' . $this->max_rows;
         } else {
@@ -1315 +1315 @@
         $has_update = false;
 
-        if ( !empty( $this->sync_table ) ) {
+        if ( ! empty( $this->sync_table ) ) {
             $query = 'SELECT value_id, meta_value FROM '            . $this->sync_table_name . ' WHERE meta_key = "_bbp_old_sticky_status_id" AND meta_value = "super-sticky" LIMIT ' . $start . ', ' . $this->max_rows;
         } else {
@@ -1346 +1346 @@
         $has_update = false;
 
-        if ( !empty( $this->sync_table ) ) {
+        if ( ! empty( $this->sync_table ) ) {
             $query = 'SELECT value_id, meta_value FROM ' . $this->sync_table_name           . ' WHERE meta_key = "_bbp_old_closed_status_id" AND meta_value = "closed" LIMIT ' . $start . ', ' . $this->max_rows;
         } else {
@@ -1373 +1373 @@
         $has_update = false;
 
-        if ( !empty( $this->sync_table ) ) {
+        if ( ! empty( $this->sync_table ) ) {
             $query = 'SELECT value_id, meta_value FROM ' . $this->sync_table_name . ' WHERE meta_key = "_bbp_old_reply_to_id" AND meta_value > 0 LIMIT ' . $start . ', ' . $this->max_rows;
         } else {
@@ -1403 +1403 @@
         $has_update = false;
 
-        if ( !empty( $this->sync_table ) ) {
+        if ( ! empty( $this->sync_table ) ) {
             $query = 'SELECT sync_table1.value_id AS topic_id, sync_table1.meta_value AS topic_is_anonymous, sync_table2.meta_value AS topic_author
                             FROM       ' . $this->sync_table_name . ' AS sync_table1
@@ -1449 +1449 @@
         $has_update = false;
 
-        if ( !empty( $this->sync_table ) ) {
+        if ( ! empty( $this->sync_table ) ) {
             $query = 'SELECT sync_table1.value_id AS reply_id, sync_table1.meta_value AS reply_is_anonymous, sync_table2.meta_value AS reply_author
                             FROM       ' . $this->sync_table_name . ' AS sync_table1
@@ -1523 +1523 @@
         $users = $this->wpdb->get_results( $query, ARRAY_A );
 
-        if ( !empty( $users ) ) {
+        if ( ! empty( $users ) ) {
             foreach ( $users as $value ) {
                 wp_delete_user( $value['value_id'] );
@@ -1552 +1552 @@
         $bbconverter = $this->wpdb->get_results( $query, ARRAY_A );
 
-        if ( !empty( $bbconverter ) ) {
+        if ( ! empty( $bbconverter ) ) {
 
             foreach ( $bbconverter as $value ) {
@@ -1612 +1612 @@
     public function callback_pass( $username, $password ) {
         $user = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT * FROM ' . $this->wpdb->users . ' WHERE user_login = "%s" AND user_pass = "" LIMIT 1', $username ) );
-        if ( !empty( $user ) ) {
+        if ( ! empty( $user ) ) {
             $usermeta = $this->wpdb->get_row( 'SELECT * FROM ' . $this->wpdb->usermeta . ' WHERE meta_key = "_bbp_password" AND user_id = "' . $user->ID . '" LIMIT 1' );
 
-            if ( !empty( $usermeta ) ) {
+            if ( ! empty( $usermeta ) ) {
                 if ( $this->authenticate_pass( $password, $usermeta->meta_value ) ) {
                     $this->wpdb->query( 'UPDATE ' . $this->wpdb->users . ' ' . 'SET user_pass = "' . wp_hash_password( $password ) . '" ' . 'WHERE ID = "' . $user->ID . '"' );
@@ -1631 +1631 @@
      */
     private function callback_forumid( $field ) {
-        if ( !isset( $this->map_forumid[$field] ) ) {
-            if ( !empty( $this->sync_table ) ) {
+        if ( ! isset( $this->map_forumid[$field] ) ) {
+            if ( ! empty( $this->sync_table ) ) {
                 $row = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT value_id, meta_value FROM ' . $this->sync_table_name . ' WHERE meta_key = "_bbp_old_forum_id" AND meta_value = "%s" LIMIT 1', $field ) );
             } else {
@@ -1654 +1654 @@
      */
     private function callback_topicid( $field ) {
-        if ( !isset( $this->map_topicid[$field] ) ) {
-            if ( !empty( $this->sync_table ) ) {
+        if ( ! isset( $this->map_topicid[$field] ) ) {
+            if ( ! empty( $this->sync_table ) ) {
                 $row = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT value_id, meta_value FROM ' . $this->sync_table_name . ' WHERE meta_key = "_bbp_old_topic_id" AND meta_value = "%s" LIMIT 1', $field ) );
             } else {
@@ -1679 +1679 @@
      */
     private function callback_reply_to( $field ) {
-        if ( !isset( $this->map_reply_to[$field] ) ) {
-            if ( !empty( $this->sync_table ) ) {
+        if ( ! isset( $this->map_reply_to[$field] ) ) {
+            if ( ! empty( $this->sync_table ) ) {
                 $row = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT value_id, meta_value FROM ' . $this->sync_table_name . ' WHERE meta_key = "_bbp_old_reply_id" AND meta_value = "%s" LIMIT 1', $field ) );
             } else {
@@ -1702 +1702 @@
      */
     private function callback_userid( $field ) {
-        if ( !isset( $this->map_userid[$field] ) ) {
-            if ( !empty( $this->sync_table ) ) {
+        if ( ! isset( $this->map_userid[$field] ) ) {
+            if ( ! empty( $this->sync_table ) ) {
                 $row = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT value_id, meta_value FROM ' . $this->sync_table_name . ' WHERE meta_key = "_bbp_old_user_id" AND meta_value = "%s" LIMIT 1', $field ) );
             } else {
@@ -1712 +1712 @@
                 $this->map_userid[$field] = $row->value_id;
             } else {
-                if ( !empty( $_POST['_bbp_converter_convert_users'] ) && ( $_POST['_bbp_converter_convert_users'] == 1 ) ) {
+                if ( ! empty( $_POST['_bbp_converter_convert_users'] ) && ( $_POST['_bbp_converter_convert_users'] == 1 ) ) {
                     $this->map_userid[$field] = 0;
                 } else {

trunk/src/includes/admin/converters/e107v1.php

@@ -567 +567 @@
         $field = preg_replace( '/(\d+?)+\.[\S\s]+/', '$1', $field );
 
-        if ( !isset( $this->map_userid[$field] ) ) {
-            if ( !empty( $this->sync_table ) ) {
+        if ( ! isset( $this->map_userid[$field] ) ) {
+            if ( ! empty( $this->sync_table ) ) {
                 $row = $this->wpdb->get_row( $this->wpdb->prepare( 'SELECT value_id, meta_value FROM ' . $this->sync_table_name . ' WHERE meta_key = "_bbp_old_user_id" AND meta_value = "%s" LIMIT 1', $field ) );
             } else {
@@ -577 +577 @@
                 $this->map_userid[$field] = $row->value_id;
             } else {
-                if ( !empty( $_POST['_bbp_converter_convert_users'] ) && ( $_POST['_bbp_converter_convert_users'] == 1 ) ) {
+                if ( ! empty( $_POST['_bbp_converter_convert_users'] ) && ( $_POST['_bbp_converter_convert_users'] == 1 ) ) {
                     $this->map_userid[$field] = 0;
                 } else {

trunk/src/includes/admin/forums.php

@@ -92 +92 @@
      */
     private function bail() {
-        if ( !isset( get_current_screen()->post_type ) || ( $this->post_type != get_current_screen()->post_type ) ) {
+        if ( ! isset( get_current_screen()->post_type ) || ( $this->post_type != get_current_screen()->post_type ) ) {
             return true;
         }
@@ -301 +301 @@
 
         // Nonce check
-        if ( empty( $_POST['bbp_forum_metabox'] ) || !wp_verify_nonce( $_POST['bbp_forum_metabox'], 'bbp_forum_metabox_save' ) ) {
+        if ( empty( $_POST['bbp_forum_metabox'] ) || ! wp_verify_nonce( $_POST['bbp_forum_metabox'], 'bbp_forum_metabox_save' ) ) {
             return $forum_id;
         }
@@ -316 +316 @@
 
         // Parent ID
-        $parent_id = ( !empty( $_POST['parent_id'] ) && is_numeric( $_POST['parent_id'] ) ) ? (int) $_POST['parent_id'] : 0;
+        $parent_id = ( ! empty( $_POST['parent_id'] ) && is_numeric( $_POST['parent_id'] ) ) ? (int) $_POST['parent_id'] : 0;
 
         // Update the forum meta bidness
@@ -437 +437 @@
 
         // Only proceed if GET is a forum toggle action
-        if ( bbp_is_get_request() && !empty( $_GET['action'] ) && in_array( $_GET['action'], array( 'bbp_toggle_forum_close' ) ) && !empty( $_GET['forum_id'] ) ) {
+        if ( bbp_is_get_request() && ! empty( $_GET['action'] ) && in_array( $_GET['action'], array( 'bbp_toggle_forum_close' ) ) && ! empty( $_GET['forum_id'] ) ) {
             $action    = $_GET['action'];            // What action is taking place?
             $forum_id  = (int) $_GET['forum_id'];    // What's the forum id?
@@ -505 +505 @@
 
         // Only proceed if GET is a forum toggle action
-        if ( bbp_is_get_request() && !empty( $_GET['bbp_forum_toggle_notice'] ) && in_array( $_GET['bbp_forum_toggle_notice'], array( 'opened', 'closed' ) ) && !empty( $_GET['forum_id'] ) ) {
+        if ( bbp_is_get_request() && ! empty( $_GET['bbp_forum_toggle_notice'] ) && in_array( $_GET['bbp_forum_toggle_notice'], array( 'opened', 'closed' ) ) && ! empty( $_GET['forum_id'] ) ) {
             $notice     = $_GET['bbp_forum_toggle_notice'];         // Which notice?
             $forum_id   = (int) $_GET['forum_id'];                  // What's the forum id?
-            $is_failure = !empty( $_GET['failed'] ) ? true : false; // Was that a failure?
+            $is_failure = ! empty( $_GET['failed'] ) ? true : false; // Was that a failure?
 
             // Bail if no forum_id or notice
@@ -621 +621 @@
             case 'bbp_forum_freshness' :
                 $last_active = bbp_get_forum_last_active_time( $forum_id, false );
-                if ( !empty( $last_active ) ) {
+                if ( ! empty( $last_active ) ) {
                     echo esc_html( $last_active );
                 } else {

trunk/src/includes/admin/functions.php

@@ -133 +133 @@
 
     // Bail if not on an admin page and not getting a sample permalink
-    if ( !empty( $sample ) && is_admin() && bbp_is_custom_post_type() ) {
+    if ( ! empty( $sample ) && is_admin() && bbp_is_custom_post_type() ) {
         return urldecode( $post_link );
     }

trunk/src/includes/admin/replies.php

@@ -99 +99 @@
      */
     private function bail() {
-        if ( !isset( get_current_screen()->post_type ) || ( $this->post_type !== get_current_screen()->post_type ) ) {
+        if ( ! isset( get_current_screen()->post_type ) || ( $this->post_type !== get_current_screen()->post_type ) ) {
             return true;
         }
@@ -305 +305 @@
 
         // Nonce check
-        if ( empty( $_POST['bbp_reply_metabox'] ) || !wp_verify_nonce( $_POST['bbp_reply_metabox'], 'bbp_reply_metabox_save' ) ) {
+        if ( empty( $_POST['bbp_reply_metabox'] ) || ! wp_verify_nonce( $_POST['bbp_reply_metabox'], 'bbp_reply_metabox_save' ) ) {
             return $reply_id;
         }
@@ -315 +315 @@
 
         // Get the reply meta post values
-        $topic_id = !empty( $_POST['parent_id']    ) ? (int) $_POST['parent_id']    : 0;
-        $forum_id = !empty( $_POST['bbp_forum_id'] ) ? (int) $_POST['bbp_forum_id'] : bbp_get_topic_forum_id( $topic_id );
-        $reply_to = !empty( $_POST['bbp_reply_to'] ) ? (int) $_POST['bbp_reply_to'] : 0;
+        $topic_id = ! empty( $_POST['parent_id']    ) ? (int) $_POST['parent_id']    : 0;
+        $forum_id = ! empty( $_POST['bbp_forum_id'] ) ? (int) $_POST['bbp_forum_id'] : bbp_get_topic_forum_id( $topic_id );
+        $reply_to = ! empty( $_POST['bbp_reply_to'] ) ? (int) $_POST['bbp_reply_to'] : 0;
 
         // Get reply author data
@@ -550 +550 @@
             $notice     = $_GET['bbp_reply_toggle_notice'];         // Which notice?
             $reply_id   = (int) $_GET['reply_id'];                  // What's the reply id?
-            $is_failure = !empty( $_GET['failed'] ) ? true : false; // Was that a failure?
+            $is_failure = ! empty( $_GET['failed'] ) ? true : false; // Was that a failure?
 
             // Empty? No reply?
@@ -675 +675 @@
 
                 // Output forum name
-                if ( !empty( $topic_id ) ) {
+                if ( ! empty( $topic_id ) ) {
 
                     // Topic Title
@@ -701 +701 @@
 
                 // Output forum name
-                if ( !empty( $reply_forum_id ) ) {
+                if ( ! empty( $reply_forum_id ) ) {
 
                     // Forum Title
@@ -847 +847 @@
 
         // Add Empty Spam button
-        if ( !empty( $_GET['post_status'] ) && ( bbp_get_spam_status_id() === $_GET['post_status'] ) && current_user_can( 'moderate' ) ) {
+        if ( ! empty( $_GET['post_status'] ) && ( bbp_get_spam_status_id() === $_GET['post_status'] ) && current_user_can( 'moderate' ) ) {
             wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
             $title = esc_attr__( 'Empty Spam', 'bbpress' );
@@ -854 +854 @@
 
         // Get which forum is selected
-        $selected = !empty( $_GET['bbp_forum_id'] ) ? $_GET['bbp_forum_id'] : '';
+        $selected = ! empty( $_GET['bbp_forum_id'] ) ? $_GET['bbp_forum_id'] : '';
 
         // Show the forums dropdown
@@ -881 +881 @@
 
         // Add post_parent query_var if one is present
-        if ( !empty( $_GET['bbp_forum_id'] ) ) {
+        if ( ! empty( $_GET['bbp_forum_id'] ) ) {
             $query_vars['meta_key']   = '_bbp_forum_id';
             $query_vars['meta_type']  = 'NUMERIC';

trunk/src/includes/admin/settings.php

@@ -724 +724 @@
     }
 
-    if ( !empty( $theme_options ) ) : ?>
+    if ( ! empty( $theme_options ) ) : ?>
 
         <select name="_bbp_theme_package_id" id="_bbp_theme_package_id" <?php bbp_maybe_admin_setting_disabled( '_bbp_theme_package_id' ); ?>><?php echo $theme_options ?></select>
@@ -1730 +1730 @@
 
             // Loop through root slugs and check for conflict
-            if ( !empty( $bp->pages ) ) {
+            if ( ! empty( $bp->pages ) ) {
                 foreach ( $bp->pages as $page => $page_data ) {
                     $page_base    = $page . '_base';

trunk/src/includes/admin/tools.php

@@ -510 +510 @@
 
         // Bump the count
-        if ( !empty( $updated ) && ! is_wp_error( $updated ) ) {
+        if ( ! empty( $updated ) && ! is_wp_error( $updated ) ) {
             ++$g_count;
         }
@@ -516 +516 @@
         // Update group to forum relationship data
         $group_id = (int) $bbp_db->get_var( "SELECT `group_id` FROM `{$groups_meta_table}` WHERE `meta_key` = 'forum_id' AND `meta_value` = '{$group_forums->ID}';" );
-        if ( !empty( $group_id ) ) {
+        if ( ! empty( $group_id ) ) {
 
             // Update the group to forum meta connection in forums
@@ -621 +621 @@
 
     $forums = get_posts( array( 'post_type' => bbp_get_forum_post_type(), 'numberposts' => -1 ) );
-    if ( !empty( $forums ) ) {
+    if ( ! empty( $forums ) ) {
         foreach ( $forums as $forum ) {
             bbp_update_forum_topic_count( $forum->ID );
@@ -668 +668 @@
     // Recalculate the metas key _bbp_reply_count and _bbp_total_reply_count for each forum
     $forums = get_posts( array( 'post_type' => bbp_get_forum_post_type(), 'numberposts' => -1 ) );
-    if ( !empty( $forums ) ) {
+    if ( ! empty( $forums ) ) {
         foreach ( $forums as $forum ) {
             bbp_update_forum_reply_count( $forum->ID );
@@ -1163 +1163 @@
     // Loop through forums
     foreach ( $forums as $forum_id ) {
-        if ( !bbp_is_forum_category( $forum_id ) ) {
+        if ( ! bbp_is_forum_category( $forum_id ) ) {
             bbp_update_forum( array( 'forum_id' => $forum_id ) );
         }
@@ -1607 +1607 @@
     /** Post Meta *************************************************************/
 
-    if ( !empty( $sql_posts ) ) {
+    if ( ! empty( $sql_posts ) ) {
         $sql_meta = array();
         foreach ( $sql_posts as $key => $value ) {
@@ -1629 +1629 @@
 
     // First, if we're deleting previously imported users, delete them now
-    if ( !empty( $_POST['bbpress-delete-imported-users'] ) ) {
+    if ( ! empty( $_POST['bbpress-delete-imported-users'] ) ) {
         $sql_users  = $bbp_db->get_results( "SELECT `user_id` FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '_bbp_user_id'", OBJECT_K );
-        if ( !empty( $sql_users ) ) {
+        if ( ! empty( $sql_users ) ) {
             $sql_meta = array();
             foreach ( $sql_users as $key => $value ) {

trunk/src/includes/admin/topics.php

@@ -99 +99 @@
      */
     private function bail() {
-        if ( !isset( get_current_screen()->post_type ) || ( $this->post_type !== get_current_screen()->post_type ) ) {
+        if ( ! isset( get_current_screen()->post_type ) || ( $this->post_type !== get_current_screen()->post_type ) ) {
             return true;
         }
@@ -301 +301 @@
 
         // Nonce check
-        if ( empty( $_POST['bbp_topic_metabox'] ) || !wp_verify_nonce( $_POST['bbp_topic_metabox'], 'bbp_topic_metabox_save' ) ) {
+        if ( empty( $_POST['bbp_topic_metabox'] ) || ! wp_verify_nonce( $_POST['bbp_topic_metabox'], 'bbp_topic_metabox_save' ) ) {
             return $topic_id;
         }
@@ -311 +311 @@
 
         // Get the forum ID
-        $forum_id = !empty( $_POST['parent_id'] ) ? (int) $_POST['parent_id'] : 0;
+        $forum_id = ! empty( $_POST['parent_id'] ) ? (int) $_POST['parent_id'] : 0;
 
         // Get topic author data
@@ -322 +322 @@
 
         // Stickies
-        if ( !empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array( 'stick', 'super', 'unstick' ) ) ) {
+        if ( ! empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array( 'stick', 'super', 'unstick' ) ) ) {
 
             // What's the haps?
@@ -498 +498 @@
 
         // Only proceed if GET is a topic toggle action
-        if ( bbp_is_get_request() && !empty( $_GET['action'] ) && in_array( $_GET['action'], array( 'bbp_toggle_topic_close', 'bbp_toggle_topic_stick', 'bbp_toggle_topic_spam', 'bbp_toggle_topic_approve' ) ) && !empty( $_GET['topic_id'] ) ) {
+        if ( bbp_is_get_request() && ! empty( $_GET['action'] ) && in_array( $_GET['action'], array( 'bbp_toggle_topic_close', 'bbp_toggle_topic_stick', 'bbp_toggle_topic_spam', 'bbp_toggle_topic_approve' ) ) && ! empty( $_GET['topic_id'] ) ) {
             $action    = $_GET['action'];            // What action is taking place?
             $topic_id  = (int) $_GET['topic_id'];    // What's the topic id?
@@ -546 +546 @@
 
                     $is_sticky = bbp_is_topic_sticky( $topic_id );
-                    $is_super  = ( false === $is_sticky ) && !empty( $_GET['super'] ) && ( "1" === $_GET['super'] )
+                    $is_super  = ( false === $is_sticky ) && ! empty( $_GET['super'] ) && ( "1" === $_GET['super'] )
                         ? true
                         : false;
@@ -614 +614 @@
             $notice     = $_GET['bbp_topic_toggle_notice'];         // Which notice?
             $topic_id   = (int) $_GET['topic_id'];                  // What's the topic id?
-            $is_failure = !empty( $_GET['failed'] ) ? true : false; // Was that a failure?
+            $is_failure = ! empty( $_GET['failed'] ) ? true : false; // Was that a failure?
 
             // Bais if no topic_id or notice
@@ -768 +768 @@
 
                 // Output forum name
-                if ( !empty( $forum_id ) ) {
+                if ( ! empty( $forum_id ) ) {
 
                     // Forum Title
@@ -812 +812 @@
             case 'bbp_topic_freshness' :
                 $last_active = bbp_get_topic_last_active_time( $topic_id, false );
-                if ( !empty( $last_active ) ) {
+                if ( ! empty( $last_active ) ) {
                     echo esc_html( $last_active );
                 } else {
@@ -948 +948 @@
 
         // Add Empty Spam button
-        if ( !empty( $_GET['post_status'] ) && ( bbp_get_spam_status_id() === $_GET['post_status'] ) && current_user_can( 'moderate' ) ) {
+        if ( ! empty( $_GET['post_status'] ) && ( bbp_get_spam_status_id() === $_GET['post_status'] ) && current_user_can( 'moderate' ) ) {
             wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
             $title = esc_attr__( 'Empty Spam', 'bbpress' );
@@ -955 +955 @@
 
         // Get which forum is selected
-        $selected = !empty( $_GET['bbp_forum_id'] ) ? $_GET['bbp_forum_id'] : '';
+        $selected = ! empty( $_GET['bbp_forum_id'] ) ? $_GET['bbp_forum_id'] : '';
 
         // Show the forums dropdown
@@ -982 +982 @@
 
         // Add post_parent query_var if one is present
-        if ( !empty( $_GET['bbp_forum_id'] ) ) {
+        if ( ! empty( $_GET['bbp_forum_id'] ) ) {
             $query_vars['meta_key']   = '_bbp_forum_id';
             $query_vars['meta_type']  = 'NUMERIC';

trunk/src/includes/common/ajax.php

@@ -107 +107 @@
 
     // Merge extra response parameters in
-    if ( !empty( $extras ) && is_array( $extras ) ) {
+    if ( ! empty( $extras ) && is_array( $extras ) ) {
         $response = array_merge( $response, $extras );
     }

trunk/src/includes/common/classes.php

@@ -396 +396 @@
 
         // Check for a callback and use it if specified
-        if ( !empty( $args['callback'] ) ) {
+        if ( ! empty( $args['callback'] ) ) {
             call_user_func( $args['callback'], $object, $args, $depth );
             return;
@@ -402 +402 @@
 
         // Style for div or list element
-        if ( !empty( $args['style'] ) && ( 'div' === $args['style'] ) ) {
+        if ( ! empty( $args['style'] ) && ( 'div' === $args['style'] ) ) {
             echo "<div>\n";
         } else {
@@ -417 +417 @@
 
         // Check for a callback and use it if specified
-        if ( !empty( $args['end-callback'] ) ) {
+        if ( ! empty( $args['end-callback'] ) ) {
             call_user_func( $args['end-callback'], $object, $args, $depth );
             return;
@@ -423 +423 @@
 
         // Style for div or list element
-        if ( !empty( $args['style'] ) && ( 'div' === $args['style'] ) ) {
+        if ( ! empty( $args['style'] ) && ( 'div' === $args['style'] ) ) {
             echo "</div>\n";
         } else {

trunk/src/includes/common/functions.php

@@ -126 +126 @@
         );
 
-        if ( !empty( $older_date ) && !is_numeric( $older_date ) ) {
+        if ( ! empty( $older_date ) && !is_numeric( $older_date ) ) {
             $time_chunks = explode( ':', str_replace( ' ', ':', $older_date ) );
             $date_chunks = explode( '-', str_replace( ' ', '-', $older_date ) );
@@ -135 +135 @@
         // between a date and the current time. $newer_date will have a value if
         // we want to work out time elapsed between two known dates.
-        $newer_date = ( !$newer_date ) ? strtotime( current_time( 'mysql', $gmt ) ) : $newer_date;
+        $newer_date = ( ! $newer_date ) ? strtotime( current_time( 'mysql', $gmt ) ) : $newer_date;
 
         // Difference in seconds
@@ -162 +162 @@
 
             // If $i iterates all the way to $j, then the event happened 0 seconds ago
-            if ( !isset( $chunks[$i] ) ) {
+            if ( ! isset( $chunks[$i] ) ) {
                 $output = $right_now_text;
 
@@ -242 +242 @@
  */
 function bbp_get_redirect_to() {
-    $retval = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+    $retval = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
 
     return apply_filters( 'bbp_get_redirect_to', $retval );
@@ -262 +262 @@
 
     // Are we appending the view=all vars?
-    if ( bbp_get_view_all() || !empty( $force ) ) {
+    if ( bbp_get_view_all() || ! empty( $force ) ) {
         $link = add_query_arg( array( 'view' => 'all' ), $original_link );
     } else {
@@ -296 +296 @@
  */
 function bbp_get_view_all( $cap = 'moderate' ) {
-    $retval = ( ( !empty( $_GET['view'] ) && ( 'all' === $_GET['view'] ) && current_user_can( $cap ) ) );
+    $retval = ( ( ! empty( $_GET['view'] ) && ( 'all' === $_GET['view'] ) && current_user_can( $cap ) ) );
     return apply_filters( 'bbp_get_view_all', (bool) $retval );
 }
@@ -316 +316 @@
 
     // Check query paged
-    } elseif ( !empty( $wp_query->query['paged'] ) ) {
+    } elseif ( ! empty( $wp_query->query['paged'] ) ) {
         $paged = $wp_query->query['paged'];
     }
 
     // Paged found
-    if ( !empty( $paged ) ) {
+    if ( ! empty( $paged ) ) {
         return (int) $paged;
     }
@@ -354 +354 @@
 
     // Post is not a topic or reply, return
-    if ( !in_array( $data['post_type'], array( bbp_get_topic_post_type(), bbp_get_reply_post_type() ) ) ) {
+    if ( ! in_array( $data['post_type'], array( bbp_get_topic_post_type(), bbp_get_reply_post_type() ) ) ) {
         return $data;
     }
 
     // Is the post by an anonymous user?
-    if ( ( bbp_get_topic_post_type() === $data['post_type'] && !bbp_is_topic_anonymous( $postarr['ID'] ) ) ||
-         ( bbp_get_reply_post_type() === $data['post_type'] && !bbp_is_reply_anonymous( $postarr['ID'] ) ) ) {
+    if ( ( bbp_get_topic_post_type() === $data['post_type'] && ! bbp_is_topic_anonymous( $postarr['ID'] ) ) ||
+         ( bbp_get_reply_post_type() === $data['post_type'] && ! bbp_is_reply_anonymous( $postarr['ID'] ) ) ) {
         return $data;
     }
@@ -480 +480 @@
 
     // Users
-    if ( !empty( $r['count_users'] ) ) {
+    if ( ! empty( $r['count_users'] ) ) {
         $user_count = bbp_get_total_users();
     }
 
     // Forums
-    if ( !empty( $r['count_forums'] ) ) {
+    if ( ! empty( $r['count_forums'] ) ) {
         $forum_count = wp_count_posts( bbp_get_forum_post_type() )->publish;
     }
@@ -496 +496 @@
 
     // Topics
-    if ( !empty( $r['count_topics'] ) ) {
+    if ( ! empty( $r['count_topics'] ) ) {
         $all_topics  = wp_count_posts( bbp_get_topic_post_type() );
 
@@ -505 +505 @@
 
             // Private
-            $topics['private'] = ( !empty( $r['count_private_topics'] ) && current_user_can( 'read_private_topics' ) ) ? (int) $all_topics->{$private} : 0;
+            $topics['private'] = ( ! empty( $r['count_private_topics'] ) && current_user_can( 'read_private_topics' ) ) ? (int) $all_topics->{$private} : 0;
 
             // Spam
-            $topics['spammed'] = ( !empty( $r['count_spammed_topics'] ) && current_user_can( 'edit_others_topics'  ) ) ? (int) $all_topics->{$spam}    : 0;
+            $topics['spammed'] = ( ! empty( $r['count_spammed_topics'] ) && current_user_can( 'edit_others_topics'  ) ) ? (int) $all_topics->{$spam}    : 0;
 
             // Trash
-            $topics['trashed'] = ( !empty( $r['count_trashed_topics'] ) && current_user_can( 'view_trash'          ) ) ? (int) $all_topics->{$trash}   : 0;
+            $topics['trashed'] = ( ! empty( $r['count_trashed_topics'] ) && current_user_can( 'view_trash'          ) ) ? (int) $all_topics->{$trash}   : 0;
 
             // Total hidden (private + spam + trash)
@@ -517 +517 @@
 
             // Generate the hidden topic count's title attribute
-            $topic_titles[] = !empty( $topics['private'] ) ? sprintf( __( 'Private: %s', 'bbpress' ), number_format_i18n( $topics['private'] ) ) : '';
-            $topic_titles[] = !empty( $topics['spammed'] ) ? sprintf( __( 'Spammed: %s', 'bbpress' ), number_format_i18n( $topics['spammed'] ) ) : '';
-            $topic_titles[] = !empty( $topics['trashed'] ) ? sprintf( __( 'Trashed: %s', 'bbpress' ), number_format_i18n( $topics['trashed'] ) ) : '';
+            $topic_titles[] = ! empty( $topics['private'] ) ? sprintf( __( 'Private: %s', 'bbpress' ), number_format_i18n( $topics['private'] ) ) : '';
+            $topic_titles[] = ! empty( $topics['spammed'] ) ? sprintf( __( 'Spammed: %s', 'bbpress' ), number_format_i18n( $topics['spammed'] ) ) : '';
+            $topic_titles[] = ! empty( $topics['trashed'] ) ? sprintf( __( 'Trashed: %s', 'bbpress' ), number_format_i18n( $topics['trashed'] ) ) : '';
 
             // Compile the hidden topic title
@@ -527 +527 @@
 
     // Replies
-    if ( !empty( $r['count_replies'] ) ) {
+    if ( ! empty( $r['count_replies'] ) ) {
 
         $all_replies = wp_count_posts( bbp_get_reply_post_type() );
@@ -537 +537 @@
 
             // Private
-            $replies['private'] = ( !empty( $r['count_private_replies'] ) && current_user_can( 'read_private_replies' ) ) ? (int) $all_replies->{$private} : 0;
+            $replies['private'] = ( ! empty( $r['count_private_replies'] ) && current_user_can( 'read_private_replies' ) ) ? (int) $all_replies->{$private} : 0;
 
             // Spam
-            $replies['spammed'] = ( !empty( $r['count_spammed_replies'] ) && current_user_can( 'edit_others_replies'  ) ) ? (int) $all_replies->{$spam}    : 0;
+            $replies['spammed'] = ( ! empty( $r['count_spammed_replies'] ) && current_user_can( 'edit_others_replies'  ) ) ? (int) $all_replies->{$spam}    : 0;
 
             // Trash
-            $replies['trashed'] = ( !empty( $r['count_trashed_replies'] ) && current_user_can( 'view_trash'           ) ) ? (int) $all_replies->{$trash}   : 0;
+            $replies['trashed'] = ( ! empty( $r['count_trashed_replies'] ) && current_user_can( 'view_trash'           ) ) ? (int) $all_replies->{$trash}   : 0;
 
             // Total hidden (private + spam + trash)
@@ -549 +549 @@
 
             // Generate the hidden topic count's title attribute
-            $reply_titles[] = !empty( $replies['private'] ) ? sprintf( __( 'Private: %s', 'bbpress' ), number_format_i18n( $replies['private'] ) ) : '';
-            $reply_titles[] = !empty( $replies['spammed'] ) ? sprintf( __( 'Spammed: %s', 'bbpress' ), number_format_i18n( $replies['spammed'] ) ) : '';
-            $reply_titles[] = !empty( $replies['trashed'] ) ? sprintf( __( 'Trashed: %s', 'bbpress' ), number_format_i18n( $replies['trashed'] ) ) : '';
+            $reply_titles[] = ! empty( $replies['private'] ) ? sprintf( __( 'Private: %s', 'bbpress' ), number_format_i18n( $replies['private'] ) ) : '';
+            $reply_titles[] = ! empty( $replies['spammed'] ) ? sprintf( __( 'Spammed: %s', 'bbpress' ), number_format_i18n( $replies['spammed'] ) ) : '';
+            $reply_titles[] = ! empty( $replies['trashed'] ) ? sprintf( __( 'Trashed: %s', 'bbpress' ), number_format_i18n( $replies['trashed'] ) ) : '';
 
             // Compile the hidden replies title
@@ -560 +560 @@
 
     // Topic Tags
-    if ( !empty( $r['count_tags'] ) && bbp_allow_topic_tags() ) {
+    if ( ! empty( $r['count_tags'] ) && bbp_allow_topic_tags() ) {
 
         // Get the count
@@ -566 +566 @@
 
         // Empty tags
-        if ( !empty( $r['count_empty_tags'] ) && current_user_can( 'edit_topic_tags' ) ) {
+        if ( ! empty( $r['count_empty_tags'] ) && current_user_can( 'edit_topic_tags' ) ) {
             $empty_topic_tag_count = wp_count_terms( bbp_get_topic_tag_tax_id() ) - $topic_tag_count;
         }
@@ -621 +621 @@
     // Parse arguments against default values
     $r = bbp_parse_args( $args, array (
-        'bbp_anonymous_name'    => !empty( $_POST['bbp_anonymous_name']    ) ? $_POST['bbp_anonymous_name']    : false,
-        'bbp_anonymous_email'   => !empty( $_POST['bbp_anonymous_email']   ) ? $_POST['bbp_anonymous_email']   : false,
-        'bbp_anonymous_website' => !empty( $_POST['bbp_anonymous_website'] ) ? $_POST['bbp_anonymous_website'] : false,
+        'bbp_anonymous_name'    => ! empty( $_POST['bbp_anonymous_name']    ) ? $_POST['bbp_anonymous_name']    : false,
+        'bbp_anonymous_email'   => ! empty( $_POST['bbp_anonymous_email']   ) ? $_POST['bbp_anonymous_email']   : false,
+        'bbp_anonymous_website' => ! empty( $_POST['bbp_anonymous_website'] ) ? $_POST['bbp_anonymous_website'] : false,
     ), 'filter_anonymous_post_data' );
 
@@ -686 +686 @@
 
     // Check for anonymous post
-    if ( empty( $r['post_author'] ) && ( !empty( $r['anonymous_data'] ) && !empty( $r['anonymous_data']['bbp_anonymous_email'] ) ) ) {
+    if ( empty( $r['post_author'] ) && ( ! empty( $r['anonymous_data'] ) && ! empty( $r['anonymous_data']['bbp_anonymous_email'] ) ) ) {
         $clauses = get_meta_sql( array( array(
             'key'   => '_bbp_anonymous_email',
@@ -706 +706 @@
     // Prepare duplicate check query
     $query  = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} {$join} WHERE post_type = %s AND post_status != %s AND post_author = %d AND post_content = %s {$where}", $r['post_type'], $r['post_status'], $r['post_author'], $r['post_content'] );
-    $query .= !empty( $r['post_parent'] ) ? $bbp_db->prepare( " AND post_parent = %d", $r['post_parent'] ) : '';
+    $query .= ! empty( $r['post_parent'] ) ? $bbp_db->prepare( " AND post_parent = %d", $r['post_parent'] ) : '';
     $query .= " LIMIT 1";
     $dupe   = apply_filters( 'bbp_check_for_duplicate_query', $query, $r );
@@ -749 +749 @@
 
     // User is anonymous, so check a transient based on the IP
-    if ( !empty( $anonymous_data ) && is_array( $anonymous_data ) ) {
+    if ( ! empty( $anonymous_data ) && is_array( $anonymous_data ) ) {
         $last_posted = get_transient( '_bbp_' . bbp_current_author_ip() . '_last_posted' );
 
-        if ( !empty( $last_posted ) && time() < $last_posted + $throttle_time ) {
+        if ( ! empty( $last_posted ) && time() < $last_posted + $throttle_time ) {
             return false;
         }
 
     // User is logged in, so check their last posted time
-    } elseif ( !empty( $author_id ) ) {
+    } elseif ( ! empty( $author_id ) ) {
         $author_id   = (int) $author_id;
         $last_posted = bbp_get_user_last_posted( $author_id );
@@ -816 +816 @@
 
         // If data exists, map it
-        if ( !empty( $user ) ) {
+        if ( ! empty( $user ) ) {
             $_post['author'] = $user->display_name;
             $_post['email']  = $user->user_email;
@@ -916 +916 @@
 
     // Bail if keymaster is author
-    if ( !empty( $author_id ) && bbp_is_user_keymaster( $author_id ) ) {
+    if ( ! empty( $author_id ) && bbp_is_user_keymaster( $author_id ) ) {
         return true;
     }
@@ -936 +936 @@
 
     // Map anonymous user data
-    if ( !empty( $anonymous_data ) ) {
+    if ( ! empty( $anonymous_data ) ) {
         $_post['author'] = $anonymous_data['bbp_anonymous_name'];
         $_post['email']  = $anonymous_data['bbp_anonymous_email'];
@@ -942 +942 @@
 
     // Map current user data
-    } elseif ( !empty( $author_id ) ) {
+    } elseif ( ! empty( $author_id ) ) {
 
         // Get author data
@@ -948 +948 @@
 
         // If data exists, map it
-        if ( !empty( $user ) ) {
+        if ( ! empty( $user ) ) {
             $_post['author'] = $user->display_name;
             $_post['email']  = $user->user_email;
@@ -1074 +1074 @@
 
     // Bail if subscriptions are turned off
-    if ( !bbp_is_subscriptions_active() ) {
+    if ( ! bbp_is_subscriptions_active() ) {
         return false;
     }
@@ -1087 +1087 @@
 
     // Bail if topic is not published
-    if ( !bbp_is_topic_published( $topic_id ) ) {
+    if ( ! bbp_is_topic_published( $topic_id ) ) {
         return false;
     }
@@ -1094 +1094 @@
 
     // Bail if reply is not published
-    if ( !bbp_is_reply_published( $reply_id ) ) {
+    if ( ! bbp_is_reply_published( $reply_id ) ) {
         return false;
     }
@@ -1167 +1167 @@
 
         // Don't send notifications to the person who made the post
-        if ( !empty( $reply_author ) && (int) $user_id === (int) $reply_author ) {
+        if ( ! empty( $reply_author ) && (int) $user_id === (int) $reply_author ) {
             continue;
         }
@@ -1232 +1232 @@
 
     // Bail if subscriptions are turned off
-    if ( !bbp_is_subscriptions_active() ) {
+    if ( ! bbp_is_subscriptions_active() ) {
         return false;
     }
@@ -1324 +1324 @@
 
         // Don't send notifications to the person who made the post
-        if ( !empty( $topic_author ) && (int) $user_id === (int) $topic_author ) {
+        if ( ! empty( $topic_author ) && (int) $user_id === (int) $topic_author ) {
             continue;
         }
@@ -1385 +1385 @@
 
         // Rejig the $redirect_to
-        if ( !isset( $_SERVER['REDIRECT_URL'] ) || ( $redirect_to !== home_url( $_SERVER['REDIRECT_URL'] ) ) ) {
+        if ( ! isset( $_SERVER['REDIRECT_URL'] ) || ( $redirect_to !== home_url( $_SERVER['REDIRECT_URL'] ) ) ) {
             $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : '';
         }
@@ -1429 +1429 @@
 
     // Passively filter the args before the parse
-    if ( !empty( $filter_key ) ) {
+    if ( ! empty( $filter_key ) ) {
         $r = apply_filters( 'bbp_before_' . $filter_key . '_parse_args', $r );
     }
 
     // Parse
-    if ( is_array( $defaults ) && !empty( $defaults ) ) {
+    if ( is_array( $defaults ) && ! empty( $defaults ) ) {
         $r = array_merge( $defaults, $r );
     }
 
     // Aggressively filter the args after the parse
-    if ( !empty( $filter_key ) ) {
+    if ( ! empty( $filter_key ) ) {
         $r = apply_filters( 'bbp_after_' . $filter_key . '_parse_args', $r );
     }
@@ -1884 +1884 @@
 
                         // Single forum
-                        if ( !empty( $select_query_vars ) ) {
+                        if ( ! empty( $select_query_vars ) ) {
 
                             // Load up our own query
@@ -1902 +1902 @@
 
                         // Only forum replies
-                        if ( !empty( $_GET['type'] ) && ( bbp_get_reply_post_type() === $_GET['type'] ) ) {
+                        if ( ! empty( $_GET['type'] ) && ( bbp_get_reply_post_type() === $_GET['type'] ) ) {
 
                             // The query
@@ -1920 +1920 @@
 
                         // Only forum topics
-                        } elseif ( !empty( $_GET['type'] ) && ( bbp_get_topic_post_type() === $_GET['type'] ) ) {
+                        } elseif ( ! empty( $_GET['type'] ) && ( bbp_get_topic_post_type() === $_GET['type'] ) ) {
 
                             // The query
@@ -1966 +1966 @@
 
                         // Single topic
-                        if ( !empty( $select_query_vars ) ) {
+                        if ( ! empty( $select_query_vars ) ) {
 
                             // Load up our own query
@@ -2021 +2021 @@
 
             // We have a view to display a feed
-            if ( !empty( $view ) ) {
+            if ( ! empty( $view ) ) {
 
                 // Get the view query
@@ -2057 +2057 @@
 
     // Path is not empty
-    if ( !empty( $path ) ) {
+    if ( ! empty( $path ) ) {
 
         // Pretty permalinks are on so path might exist

trunk/src/includes/common/shortcodes.php

@@ -224 +224 @@
 
         // Sanity check required info
-        if ( !empty( $content ) || ( empty( $attr['id'] ) || !is_numeric( $attr['id'] ) ) ) {
+        if ( ! empty( $content ) || ( empty( $attr['id'] ) || !is_numeric( $attr['id'] ) ) ) {
             return $content;
         }
@@ -232 +232 @@
 
         // Bail if ID passed is not a forum
-        if ( !bbp_is_forum( $forum_id ) ) {
+        if ( ! bbp_is_forum( $forum_id ) ) {
             return $content;
         }
@@ -320 +320 @@
 
         // Sanity check required info
-        if ( !empty( $content ) || ( empty( $attr['id'] ) || !is_numeric( $attr['id'] ) ) ) {
+        if ( ! empty( $content ) || ( empty( $attr['id'] ) || !is_numeric( $attr['id'] ) ) ) {
             return $content;
         }
@@ -332 +332 @@
 
         // Bail if ID passed is not a topic
-        if ( !bbp_is_topic( $topic_id ) ) {
+        if ( ! bbp_is_topic( $topic_id ) ) {
             return $content;
         }
 
         // Reset the queries if not in theme compat
-        if ( !bbp_is_theme_compat_active() ) {
+        if ( ! bbp_is_theme_compat_active() ) {
 
             $bbp = bbpress();
@@ -386 +386 @@
 
         // Sanity check supplied info
-        if ( !empty( $content ) || ( !empty( $attr['forum_id'] ) && ( !is_numeric( $attr['forum_id'] ) || !bbp_is_forum( $attr['forum_id'] ) ) ) ) {
+        if ( ! empty( $content ) || ( ! empty( $attr['forum_id'] ) && ( !is_numeric( $attr['forum_id'] ) || ! bbp_is_forum( $attr['forum_id'] ) ) ) ) {
             return $content;
         }
@@ -394 +394 @@
 
         // If forum id is set, use the 'bbp_single_forum' query name
-        if ( !empty( $attr['forum_id'] ) ) {
+        if ( ! empty( $attr['forum_id'] ) ) {
 
             // Set the global current_forum_id for future requests
@@ -441 +441 @@
 
         // Sanity check required info
-        if ( !empty( $content ) || ( empty( $attr['id'] ) || !is_numeric( $attr['id'] ) ) ) {
+        if ( ! empty( $content ) || ( empty( $attr['id'] ) || !is_numeric( $attr['id'] ) ) ) {
             return $content;
         }
@@ -453 +453 @@
 
         // Bail if ID passed is not a reply
-        if ( !bbp_is_reply( $reply_id ) ) {
+        if ( ! bbp_is_reply( $reply_id ) ) {
             return $content;
         }
 
         // Reset the queries if not in theme compat
-        if ( !bbp_is_theme_compat_active() ) {
+        if ( ! bbp_is_theme_compat_active() ) {
 
             $bbp = bbpress();
@@ -553 +553 @@
 
         // Sanity check required info
-        if ( !empty( $content ) || ( empty( $attr['id'] ) || !is_numeric( $attr['id'] ) ) ) {
+        if ( ! empty( $content ) || ( empty( $attr['id'] ) || !is_numeric( $attr['id'] ) ) ) {
             return $content;
         }
@@ -688 +688 @@
 
         // Sanity check required info
-        if ( !empty( $content ) ) {
+        if ( ! empty( $content ) ) {
             return $content;
         }

trunk/src/includes/common/template.php

@@ -130 +130 @@
 
     // Supplied ID is a forum
-    if ( !empty( $post_id ) && ( bbp_get_forum_post_type() === get_post_type( $post_id ) ) ) {
+    if ( ! empty( $post_id ) && ( bbp_get_forum_post_type() === get_post_type( $post_id ) ) ) {
         $retval = true;
     }
@@ -154 +154 @@
 
     // In forum archive
-    if ( is_post_type_archive( bbp_get_forum_post_type() ) || bbp_is_query_name( 'bbp_forum_archive' ) || !empty( $wp_query->bbp_show_topics_on_root ) ) {
+    if ( is_post_type_archive( bbp_get_forum_post_type() ) || bbp_is_query_name( 'bbp_forum_archive' ) || ! empty( $wp_query->bbp_show_topics_on_root ) ) {
         $retval = true;
     }
@@ -206 +206 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_forum_edit ) && ( $wp_query->bbp_is_forum_edit === true ) ) {
+    if ( ! empty( $wp_query->bbp_is_forum_edit ) && ( $wp_query->bbp_is_forum_edit === true ) ) {
         $retval = true;
 
     // Editing in admin
-    } elseif ( is_admin() && ( 'post.php' === $pagenow ) && ( get_post_type() === bbp_get_forum_post_type() ) && ( !empty( $_GET['action'] ) && ( 'edit' === $_GET['action'] ) ) ) {
+    } elseif ( is_admin() && ( 'post.php' === $pagenow ) && ( get_post_type() === bbp_get_forum_post_type() ) && ( ! empty( $_GET['action'] ) && ( 'edit' === $_GET['action'] ) ) ) {
         $retval = true;
     }
@@ -233 +233 @@
 
     // Supplied ID is a topic
-    if ( !empty( $post_id ) && ( bbp_get_topic_post_type() === get_post_type( $post_id ) ) ) {
+    if ( ! empty( $post_id ) && ( bbp_get_topic_post_type() === get_post_type( $post_id ) ) ) {
         $retval = true;
     }
@@ -308 +308 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_topic_edit ) && ( $wp_query->bbp_is_topic_edit === true ) ) {
+    if ( ! empty( $wp_query->bbp_is_topic_edit ) && ( $wp_query->bbp_is_topic_edit === true ) ) {
         $retval = true;
 
     // Editing in admin
-    } elseif ( is_admin() && ( 'post.php' === $pagenow ) && ( get_post_type() === bbp_get_topic_post_type() ) && ( !empty( $_GET['action'] ) && ( 'edit' === $_GET['action'] ) ) ) {
+    } elseif ( is_admin() && ( 'post.php' === $pagenow ) && ( get_post_type() === bbp_get_topic_post_type() ) && ( ! empty( $_GET['action'] ) && ( 'edit' === $_GET['action'] ) ) ) {
         $retval = true;
     }
@@ -333 +333 @@
 
     // Check topic edit and GET params
-    if ( bbp_is_topic_edit() && !empty( $_GET['action'] ) && ( 'merge' === $_GET['action'] ) ) {
+    if ( bbp_is_topic_edit() && ! empty( $_GET['action'] ) && ( 'merge' === $_GET['action'] ) ) {
         return true;
     }
@@ -354 +354 @@
 
     // Check topic edit and GET params
-    if ( bbp_is_topic_edit() && !empty( $_GET['action'] ) && ( 'split' === $_GET['action'] ) ) {
+    if ( bbp_is_topic_edit() && ! empty( $_GET['action'] ) && ( 'split' === $_GET['action'] ) ) {
         $retval = true;
     }
@@ -384 +384 @@
 
     // Check tax and query vars
-    if ( is_tax( bbp_get_topic_tag_tax_id() ) || !empty( bbpress()->topic_query->is_tax ) || get_query_var( 'bbp_topic_tag' ) ) {
+    if ( is_tax( bbp_get_topic_tag_tax_id() ) || ! empty( bbpress()->topic_query->is_tax ) || get_query_var( 'bbp_topic_tag' ) ) {
         $retval = true;
     }
@@ -411 +411 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_topic_tag_edit ) && ( true === $wp_query->bbp_is_topic_tag_edit ) ) {
+    if ( ! empty( $wp_query->bbp_is_topic_tag_edit ) && ( true === $wp_query->bbp_is_topic_tag_edit ) ) {
         $retval = true;
 
     // Editing in admin
-    } elseif ( is_admin() && ( 'edit-tags.php' === $pagenow ) && ( bbp_get_topic_tag_tax_id() === $taxnow ) && ( !empty( $_GET['action'] ) && ( 'edit' === $_GET['action'] ) ) ) {
+    } elseif ( is_admin() && ( 'edit-tags.php' === $pagenow ) && ( bbp_get_topic_tag_tax_id() === $taxnow ) && ( ! empty( $_GET['action'] ) && ( 'edit' === $_GET['action'] ) ) ) {
         $retval = true;
     }
@@ -468 +468 @@
 
     // Supplied ID is a reply
-    if ( !empty( $post_id ) && ( bbp_get_reply_post_type() === get_post_type( $post_id ) ) ) {
+    if ( ! empty( $post_id ) && ( bbp_get_reply_post_type() === get_post_type( $post_id ) ) ) {
         $retval = true;
     }
@@ -490 +490 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_reply_edit ) && ( true === $wp_query->bbp_is_reply_edit ) ) {
+    if ( ! empty( $wp_query->bbp_is_reply_edit ) && ( true === $wp_query->bbp_is_reply_edit ) ) {
         $retval = true;
 
     // Editing in admin
-    } elseif ( is_admin() && ( 'post.php' === $pagenow ) && ( get_post_type() === bbp_get_reply_post_type() ) && ( !empty( $_GET['action'] ) && ( 'edit' === $_GET['action'] ) ) ) {
+    } elseif ( is_admin() && ( 'post.php' === $pagenow ) && ( get_post_type() === bbp_get_reply_post_type() ) && ( ! empty( $_GET['action'] ) && ( 'edit' === $_GET['action'] ) ) ) {
         $retval = true;
     }
@@ -513 +513 @@
 
     // Check reply edit and GET params
-    if ( bbp_is_reply_edit() && !empty( $_GET['action'] ) && ( 'move' === $_GET['action'] ) ) {
+    if ( bbp_is_reply_edit() && ! empty( $_GET['action'] ) && ( 'move' === $_GET['action'] ) ) {
         $retval = true;
     }
@@ -564 +564 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_single_user_favs ) && ( true === $wp_query->bbp_is_single_user_favs ) ) {
+    if ( ! empty( $wp_query->bbp_is_single_user_favs ) && ( true === $wp_query->bbp_is_single_user_favs ) ) {
         $retval = true;
     }
@@ -585 +585 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_single_user_subs ) && ( true === $wp_query->bbp_is_single_user_subs ) ) {
+    if ( ! empty( $wp_query->bbp_is_single_user_subs ) && ( true === $wp_query->bbp_is_single_user_subs ) ) {
         $retval = true;
     }
@@ -607 +607 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_single_user_topics ) && ( true === $wp_query->bbp_is_single_user_topics ) ) {
+    if ( ! empty( $wp_query->bbp_is_single_user_topics ) && ( true === $wp_query->bbp_is_single_user_topics ) ) {
         $retval = true;
     }
@@ -629 +629 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_single_user_replies ) && ( true === $wp_query->bbp_is_single_user_replies ) ) {
+    if ( ! empty( $wp_query->bbp_is_single_user_replies ) && ( true === $wp_query->bbp_is_single_user_replies ) ) {
         $retval = true;
     }
@@ -653 +653 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_single_user_home ) && ( true === $wp_query->bbp_is_single_user_home ) ) {
+    if ( ! empty( $wp_query->bbp_is_single_user_home ) && ( true === $wp_query->bbp_is_single_user_home ) ) {
         $retval = true;
     }
@@ -697 +697 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_single_user ) && ( true === $wp_query->bbp_is_single_user ) ) {
+    if ( ! empty( $wp_query->bbp_is_single_user ) && ( true === $wp_query->bbp_is_single_user ) ) {
         $retval = true;
     }
@@ -719 +719 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_single_user_edit ) && ( true === $wp_query->bbp_is_single_user_edit ) ) {
+    if ( ! empty( $wp_query->bbp_is_single_user_edit ) && ( true === $wp_query->bbp_is_single_user_edit ) ) {
         $retval = true;
     }
@@ -741 +741 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_single_user_profile ) && ( true === $wp_query->bbp_is_single_user_profile ) ) {
+    if ( ! empty( $wp_query->bbp_is_single_user_profile ) && ( true === $wp_query->bbp_is_single_user_profile ) ) {
         $retval = true;
     }
@@ -763 +763 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_single_user_topics ) && ( true === $wp_query->bbp_is_single_user_topics ) ) {
+    if ( ! empty( $wp_query->bbp_is_single_user_topics ) && ( true === $wp_query->bbp_is_single_user_topics ) ) {
         $retval = true;
     }
@@ -785 +785 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_single_user_replies ) && ( true === $wp_query->bbp_is_single_user_replies ) ) {
+    if ( ! empty( $wp_query->bbp_is_single_user_replies ) && ( true === $wp_query->bbp_is_single_user_replies ) ) {
         $retval = true;
     }
@@ -808 +808 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_view ) && ( true === $wp_query->bbp_is_view ) ) {
+    if ( ! empty( $wp_query->bbp_is_view ) && ( true === $wp_query->bbp_is_view ) ) {
         $retval = true;
     }
@@ -841 +841 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_search ) && ( true === $wp_query->bbp_is_search ) ) {
+    if ( ! empty( $wp_query->bbp_is_search ) && ( true === $wp_query->bbp_is_search ) ) {
         $retval = true;
     }
@@ -879 +879 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_search_terms ) ) {
+    if ( ! empty( $wp_query->bbp_search_terms ) ) {
         $retval = true;
     }
@@ -889 +889 @@
 
     // Check $_REQUEST
-    if ( empty( $retval ) && !empty( $_REQUEST[ bbp_get_search_rewrite_id() ] ) ) {
+    if ( empty( $retval ) && ! empty( $_REQUEST[ bbp_get_search_rewrite_id() ] ) ) {
         $retval = true;
     }
@@ -911 +911 @@
 
     // Check query
-    if ( !empty( $wp_query->bbp_is_edit ) && ( $wp_query->bbp_is_edit === true ) ) {
+    if ( ! empty( $wp_query->bbp_is_edit ) && ( $wp_query->bbp_is_edit === true ) ) {
         $retval = true;
     }
@@ -1058 +1058 @@
 
     // Add bbPress class if we are within a bbPress page
-    if ( !empty( $bbp_classes ) ) {
+    if ( ! empty( $bbp_classes ) ) {
         $bbp_classes[] = 'bbpress';
     }
@@ -1467 +1467 @@
 
         // Force array
-        if ( !empty( $r['exclude'] ) && !is_array( $r['exclude'] ) ) {
+        if ( ! empty( $r['exclude'] ) && !is_array( $r['exclude'] ) ) {
             $r['exclude'] = explode( ',', $r['exclude'] );
         }
@@ -1499 +1499 @@
 
             // Setup the tab index attribute
-            $tab       = !empty( $r['tab'] ) ? ' tabindex="' . intval( $r['tab'] ) . '"' : '';
+            $tab       = ! empty( $r['tab'] ) ? ' tabindex="' . intval( $r['tab'] ) . '"' : '';
 
             // Open the select tag
@@ -1506 +1506 @@
 
         // Display a leading 'no-value' option, with or without custom text
-        if ( !empty( $r['show_none'] ) || !empty( $r['none_found'] ) ) {
+        if ( ! empty( $r['show_none'] ) || ! empty( $r['none_found'] ) ) {
 
             // Open the 'no-value' option tag
@@ -1547 +1547 @@
 
         // Items found so walk the tree
-        if ( !empty( $r['posts'] ) ) {
+        if ( ! empty( $r['posts'] ) ) {
             $retval .= walk_page_dropdown_tree( $r['posts'], 0, $r );
         }
@@ -1817 +1817 @@
 
         // Output something before the editor
-        if ( !empty( $r['before'] ) ) {
+        if ( ! empty( $r['before'] ) ) {
             echo $r['before'];
         }
@@ -1859 +1859 @@
 
             // Setup the tab index attribute
-            $tab = !empty( $r['tab'] ) ? ' tabindex="' . intval( $r['tab'] ) . '"' : ''; ?>
+            $tab = ! empty( $r['tab'] ) ? ' tabindex="' . intval( $r['tab'] ) . '"' : ''; ?>
 
             <textarea id="bbp_<?php echo esc_attr( $r['context'] ); ?>_content" class="<?php echo esc_attr( $r['editor_class'] ); ?>" name="bbp_<?php echo esc_attr( $r['context'] ); ?>_content" cols="60" rows="<?php echo esc_attr( $r['textarea_rows'] ); ?>" <?php echo $tab; ?>><?php echo $post_content; ?></textarea>
@@ -1866 +1866 @@
 
         // Output something after the editor
-        if ( !empty( $r['after'] ) ) {
+        if ( ! empty( $r['after'] ) ) {
             echo $r['after'];
         }
@@ -1983 +1983 @@
         $bbp = bbpress();
 
-        if ( !empty( $view ) ) {
+        if ( ! empty( $view ) ) {
             $view = sanitize_title( $view );
         } elseif ( ! empty( $bbp->current_view_id ) ) {
@@ -2203 +2203 @@
 
             // Set home text to page title
-            if ( !empty( $front_id ) ) {
+            if ( ! empty( $front_id ) ) {
                 $pre_front_text = get_the_title( $front_id );
 
@@ -2217 +2217 @@
         if ( empty( $args['root_text'] ) ) {
             $page = bbp_get_page_by_path( bbp_get_root_slug() );
-            if ( !empty( $page ) ) {
+            if ( ! empty( $page ) ) {
                 $root_id = $page->ID;
             }
@@ -2226 +2226 @@
 
         // Root slug is also the front page
-        if ( !empty( $front_id ) && ( $front_id === $root_id ) ) {
+        if ( ! empty( $front_id ) && ( $front_id === $root_id ) ) {
             $pre_include_root = false;
         }
@@ -2236 +2236 @@
 
         // Don't show root if viewing page in place of forum archive
-        if ( !empty( $root_id ) && ( ( is_single() || is_page() ) && ( $root_id === get_the_ID() ) ) ) {
+        if ( ! empty( $root_id ) && ( ( is_single() || is_page() ) && ( $root_id === get_the_ID() ) ) ) {
             $pre_include_root = false;
         }
@@ -2271 +2271 @@
 
         // Topic Tag (or theme compat topic tag)
-        } elseif ( bbp_is_topic_tag() || ( get_query_var( 'bbp_topic_tag' ) && !bbp_is_topic_tag_edit() ) ) {
+        } elseif ( bbp_is_topic_tag() || ( get_query_var( 'bbp_topic_tag' ) && ! bbp_is_topic_tag_edit() ) ) {
 
             // Always include the tag name
@@ -2335 +2335 @@
 
         // Do we want to include a link to home?
-        if ( !empty( $r['include_home'] ) || empty( $r['home_text'] ) ) {
+        if ( ! empty( $r['include_home'] ) || empty( $r['home_text'] ) ) {
             $crumbs[] = '<a href="' . trailingslashit( home_url() ) . '" class="bbp-breadcrumb-home">' . $r['home_text'] . '</a>';
         }
 
         // Do we want to include a link to the forum root?
-        if ( !empty( $r['include_root'] ) || empty( $r['root_text'] ) ) {
+        if ( ! empty( $r['include_root'] ) || empty( $r['root_text'] ) ) {
 
             // Page exists at root slug path, so use its permalink
             $page = bbp_get_page_by_path( bbp_get_root_slug() );
-            if ( !empty( $page ) ) {
+            if ( ! empty( $page ) ) {
                 $root_url = get_permalink( $page->ID );
 
@@ -2357 +2357 @@
 
         // Ancestors exist
-        if ( !empty( $ancestors ) ) {
+        if ( ! empty( $ancestors ) ) {
 
             // Loop through parents
@@ -2407 +2407 @@
 
         // Add current page to breadcrumb
-        if ( !empty( $r['include_current'] ) || empty( $r['current_text'] ) ) {
+        if ( ! empty( $r['include_current'] ) || empty( $r['current_text'] ) ) {
             $crumbs[] = $r['current_before'] . $r['current_text'] . $r['current_after'];
         }
@@ -2421 +2421 @@
 
         // Pad the separator
-        if ( !empty( $r['pad_sep'] ) ) {
+        if ( ! empty( $r['pad_sep'] ) ) {
             if ( function_exists( 'mb_strlen' ) ) {
                 $sep = str_pad( $sep, mb_strlen( $sep ) + ( (int) $r['pad_sep'] * 2 ), ' ', STR_PAD_BOTH );
@@ -2436 +2436 @@
 
         // Build the trail
-        $trail  = !empty( $crumbs ) ? ( $r['before'] . $r['crumb_before'] . implode( $sep . $r['crumb_after'] . $r['crumb_before'] , $crumbs ) . $r['crumb_after'] . $r['after'] ) : '';
+        $trail  = ! empty( $crumbs ) ? ( $r['before'] . $r['crumb_before'] . implode( $sep . $r['crumb_after'] . $r['crumb_before'] , $crumbs ) . $r['crumb_after'] . $r['after'] ) : '';
 
         return apply_filters( 'bbp_get_breadcrumb', $trail, $crumbs, $r );
@@ -2501 +2501 @@
 
     // Bail if no notices or errors
-    if ( !bbp_has_errors() ) {
+    if ( ! bbp_has_errors() ) {
         return;
     }
@@ -2528 +2528 @@
 
     // Display errors first...
-    if ( !empty( $errors ) ) : ?>
+    if ( ! empty( $errors ) ) : ?>
 
         <div class="bbp-template-notice error" role="alert" tabindex="-1">
@@ -2539 +2539 @@
 
     // ...and messages last
-    if ( !empty( $messages ) ) : ?>
+    if ( ! empty( $messages ) ) : ?>
 
         <div class="bbp-template-notice">
@@ -2753 +2753 @@
     $prefix = '';
 
-    if ( !empty( $new_title ) ) {
+    if ( ! empty( $new_title ) ) {
         $prefix = " $sep ";
     }

trunk/src/includes/common/widgets.php

@@ -79 +79 @@
         echo $args['before_widget'];
 
-        if ( !empty( $settings['title'] ) ) {
+        if ( ! empty( $settings['title'] ) ) {
             echo $args['before_title'] . $settings['title'] . $args['after_title'];
         }
@@ -114 +114 @@
                     </div>
 
-                    <?php if ( !empty( $settings['register'] ) || !empty( $settings['lostpass'] ) ) : ?>
+                    <?php if ( ! empty( $settings['register'] ) || ! empty( $settings['lostpass'] ) ) : ?>
 
                         <div class="bbp-login-links">
 
-                            <?php if ( !empty( $settings['register'] ) ) : ?>
+                            <?php if ( ! empty( $settings['register'] ) ) : ?>
 
                                 <a href="<?php echo esc_url( $settings['register'] ); ?>" title="<?php esc_attr_e( 'Register', 'bbpress' ); ?>" class="bbp-register-link"><?php _e( 'Register', 'bbpress' ); ?></a>
@@ -124 +124 @@
                             <?php endif; ?>
 
-                            <?php if ( !empty( $settings['lostpass'] ) ) : ?>
+                            <?php if ( ! empty( $settings['lostpass'] ) ) : ?>
 
                                 <a href="<?php echo esc_url( $settings['lostpass'] ); ?>" title="<?php esc_attr_e( 'Lost Password', 'bbpress' ); ?>" class="bbp-lostpass-link"><?php _e( 'Lost Password', 'bbpress' ); ?></a>
@@ -288 +288 @@
         echo $args['before_widget'];
 
-        if ( !empty( $settings['title'] ) ) {
+        if ( ! empty( $settings['title'] ) ) {
             echo $args['before_title'] . $settings['title'] . $args['after_title'];
         } ?>
@@ -425 +425 @@
         echo $args['before_widget'];
 
-        if ( !empty( $settings['title'] ) ) {
+        if ( ! empty( $settings['title'] ) ) {
             echo $args['before_title'] . $settings['title'] . $args['after_title'];
         }
@@ -577 +577 @@
         echo $args['before_widget'];
 
-        if ( !empty( $settings['title'] ) ) {
+        if ( ! empty( $settings['title'] ) ) {
             echo $args['before_title'] . $settings['title'] . $args['after_title'];
         } ?>
@@ -611 +611 @@
 
         // Force to any
-        if ( !empty( $instance['parent_forum'] ) && !is_numeric( $instance['parent_forum'] ) ) {
+        if ( ! empty( $instance['parent_forum'] ) && !is_numeric( $instance['parent_forum'] ) ) {
             $instance['parent_forum'] = 'any';
         }
@@ -794 +794 @@
         echo $args['before_widget'];
 
-        if ( !empty( $settings['title'] ) ) {
+        if ( ! empty( $settings['title'] ) ) {
             echo $args['before_title'] . $settings['title'] . $args['after_title'];
         } ?>
@@ -856 +856 @@
 
         // Force to any
-        if ( !empty( $instance['parent_forum'] ) && !is_numeric( $instance['parent_forum'] ) ) {
+        if ( ! empty( $instance['parent_forum'] ) && !is_numeric( $instance['parent_forum'] ) ) {
             $instance['parent_forum'] = 'any';
         }
@@ -990 +990 @@
         echo $args['before_widget'];
 
-        if ( !empty( $settings['title'] ) ) {
+        if ( ! empty( $settings['title'] ) ) {
             echo $args['before_title'] . $settings['title'] . $args['after_title'];
         }
@@ -1140 +1140 @@
         echo $args['before_widget'];
 
-        if ( !empty( $settings['title'] ) ) {
+        if ( ! empty( $settings['title'] ) ) {
             echo $args['before_title'] . $settings['title'] . $args['after_title'];
         } ?>
@@ -1164 +1164 @@
 
                     // Reply author, link, and timestamp
-                    if ( ! empty( $settings['show_date'] ) && !empty( $author_link ) ) :
+                    if ( ! empty( $settings['show_date'] ) && ! empty( $author_link ) ) :
 
                         // translators: 1: reply author, 2: reply link, 3: reply timestamp
@@ -1176 +1176 @@
 
                     // Reply author and title
-                    elseif ( !empty( $author_link ) ) :
+                    elseif ( ! empty( $author_link ) ) :
 
                         // translators: 1: reply author, 2: reply link

trunk/src/includes/core/extend.php

@@ -29 +29 @@
 
     // Bail if Akismet is turned off
-    if ( !bbp_is_akismet_active() ) {
+    if ( ! bbp_is_akismet_active() ) {
         return;
     }

trunk/src/includes/core/functions.php

@@ -196 +196 @@
 
     // Set show_stickies to false if it wasn't supplied
-    if ( !isset( $query_args['show_stickies'] ) ) {
+    if ( ! isset( $query_args['show_stickies'] ) ) {
         $query_args['show_stickies'] = false;
     }
@@ -222 +222 @@
     $view = sanitize_title( $view );
 
-    if ( !isset( $bbp->views[ $view ] ) ) {
+    if ( ! isset( $bbp->views[ $view ] ) ) {
         return false;
     }
@@ -253 +253 @@
     $query_args = bbp_get_view_query_args( $view );
 
-    if ( !empty( $new_args ) ) {
+    if ( ! empty( $new_args ) ) {
         $new_args   = bbp_parse_args( $new_args, '', 'view_query' );
         $query_args = array_merge( $query_args, $new_args );
@@ -272 +272 @@
 function bbp_get_view_query_args( $view ) {
     $view   = bbp_get_view_id( $view );
-    $retval = !empty( $view ) ? bbpress()->views[$view]['query'] : false;
+    $retval = ! empty( $view ) ? bbpress()->views[$view]['query'] : false;
 
     return apply_filters( 'bbp_get_view_query_args', $retval, $view );

trunk/src/includes/core/template-functions.php

@@ -103 +103 @@
 
     // Maybe load the template if one was located
-    if ( ( defined( 'WP_USE_THEMES' ) && WP_USE_THEMES ) && ( true === $load ) && !empty( $located ) ) {
+    if ( ( defined( 'WP_USE_THEMES' ) && WP_USE_THEMES ) && ( true === $load ) && ! empty( $located ) ) {
         load_template( $located, $require_once );
     }
@@ -158 +158 @@
 
     // Enqueue if located
-    if ( !empty( $located ) ) {
+    if ( ! empty( $located ) ) {
 
         $content_dir = constant( 'WP_CONTENT_DIR' );
@@ -226 +226 @@
 
     // Enqueue if located
-    if ( !empty( $located ) ) {
+    if ( ! empty( $located ) ) {
 
         $content_dir = constant( 'WP_CONTENT_DIR' );
@@ -504 +504 @@
 
     // It is a user page - We'll also check if it is user edit
-    if ( !empty( $bbp_user ) ) {
+    if ( ! empty( $bbp_user ) ) {
 
         /** Find User *********************************************************/
@@ -534 +534 @@
 
         // View or edit?
-        if ( !empty( $is_edit ) ) {
+        if ( ! empty( $is_edit ) ) {
 
             // We are editing a profile
@@ -602 +602 @@
 
     // View Page
-    } elseif ( !empty( $bbp_view ) ) {
+    } elseif ( ! empty( $bbp_view ) ) {
 
         // Check if the view exists by checking if there are query args are set
@@ -624 +624 @@
         // Check if there are search query args set
         $search_terms = bbp_get_search_terms();
-        if ( !empty( $search_terms ) ) {
+        if ( ! empty( $search_terms ) ) {
             $posts_query->bbp_search_terms = $search_terms;
         }
@@ -635 +635 @@
 
     // Forum/Topic/Reply Edit Page
-    } elseif ( !empty( $is_edit ) ) {
+    } elseif ( ! empty( $is_edit ) ) {
 
         // Get the post type from the main query loop
@@ -641 +641 @@
 
         // Check which post_type we are editing, if any
-        if ( !empty( $post_type ) ) {
+        if ( ! empty( $post_type ) ) {
             switch( $post_type ) {
 

trunk/src/includes/core/template-loader.php

@@ -111 +111 @@
     // A bbPress template file was located, so override the WordPress template
     // and use it to switch off bbPress's theme compatibility.
-    if ( !empty( $new_template ) ) {
+    if ( ! empty( $new_template ) ) {
         $template = bbp_set_template_included( $new_template );
     }
@@ -160 +160 @@
     }
 
-    if ( ! defined( 'WP_INSTALLING' ) || ( !empty( $pagenow ) && ( 'wp-activate.php' !== $pagenow ) ) ) {
+    if ( ! defined( 'WP_INSTALLING' ) || ( ! empty( $pagenow ) && ( 'wp-activate.php' !== $pagenow ) ) ) {
         bbp_locate_template( 'bbpress-functions.php', true );
     }

trunk/src/includes/core/theme-compat.php

@@ -536 +536 @@
         // Reset post
         bbp_theme_compat_reset_post( array(
-            'ID'             => !empty( $page->ID ) ? $page->ID : 0,
+            'ID'             => ! empty( $page->ID ) ? $page->ID : 0,
             'post_title'     => $new_title,
             'post_author'    => 0,
@@ -606 +606 @@
         // Reset post
         bbp_theme_compat_reset_post( array(
-            'ID'             => !empty( $page->ID ) ? $page->ID : 0,
+            'ID'             => ! empty( $page->ID ) ? $page->ID : 0,
             'post_title'     => bbp_get_topic_archive_title(),
             'post_author'    => 0,
@@ -877 +877 @@
 
         // Filters exist in this priority
-        if ( !empty( $priority ) && isset( $wp_filter[$tag][$priority] ) ) {
+        if ( ! empty( $priority ) && isset( $wp_filter[$tag][$priority] ) ) {
 
             // Store filters in a backup
@@ -929 +929 @@
 
         // Filters exist in this priority
-        if ( !empty( $priority ) && isset( $bbp->filters->wp_filter[$tag][$priority] ) ) {
+        if ( ! empty( $priority ) && isset( $bbp->filters->wp_filter[$tag][$priority] ) ) {
 
             // Store filters in a backup

trunk/src/includes/core/update.php

@@ -68 +68 @@
 
     // Bail if not activating
-    if ( empty( $action ) || !in_array( $action, array( 'activate', 'activate-selected' ) ) ) {
+    if ( empty( $action ) || ! in_array( $action, array( 'activate', 'activate-selected' ) ) ) {
         return false;
     }
@@ -80 +80 @@
 
     // Set basename if empty
-    if ( empty( $basename ) && !empty( $bbp->basename ) ) {
+    if ( empty( $basename ) && ! empty( $bbp->basename ) ) {
         $basename = $bbp->basename;
     }
@@ -117 +117 @@
 
     // Bail if not deactivating
-    if ( empty( $action ) || !in_array( $action, array( 'deactivate', 'deactivate-selected' ) ) ) {
+    if ( empty( $action ) || ! in_array( $action, array( 'deactivate', 'deactivate-selected' ) ) ) {
         return false;
     }
@@ -129 +129 @@
 
     // Set basename if empty
-    if ( empty( $basename ) && !empty( $bbp->basename ) ) {
+    if ( empty( $basename ) && ! empty( $bbp->basename ) ) {
         $basename = $bbp->basename;
     }

trunk/src/includes/extend/akismet.php

@@ -397 +397 @@
 
             // Key should not be ignored
-            if ( !in_array( $key, $ignore ) && is_string( $value ) ) {
+            if ( ! in_array( $key, $ignore ) && is_string( $value ) ) {
                 $post_data[$key] = $value;
 
@@ -422 +422 @@
 
         // Check the high-speed cam
-        if ( !empty( $response[1] ) ) {
+        if ( ! empty( $response[1] ) ) {
             $post_data['bbp_akismet_result'] = $response[1];
         } else {
@@ -462 +462 @@
 
         // Set up Akismet last post data
-        if ( !empty( $this->last_post ) ) {
+        if ( ! empty( $this->last_post ) ) {
             $as_submitted = $this->last_post['bbp_post_as_submitted'];
         }
@@ -468 +468 @@
         // wp_insert_post() might be called in other contexts. Ensure this is
         // the same topic/reply as was checked by BBP_Akismet::check_post()
-        if ( is_object( $_post ) && !empty( $this->last_post ) && is_array( $as_submitted ) ) {
+        if ( is_object( $_post ) && ! empty( $this->last_post ) && is_array( $as_submitted ) ) {
 
             // Get user data
@@ -612 +612 @@
 
         // Save the terms for later in case the reply gets hammed
-        if ( !empty( $terms ) ) {
+        if ( ! empty( $terms ) ) {
             update_post_meta( $reply_id, '_bbp_akismet_spam_terms', $terms );
         }
@@ -649 +649 @@
 
         // Use specific IP (if provided)
-        if ( !empty( $ip ) && long2ip( ip2long( $ip ) ) ) {
+        if ( ! empty( $ip ) && long2ip( ip2long( $ip ) ) ) {
             $http_host = $ip;
         }
@@ -758 +758 @@
         <div class="akismet-history" style="margin: 13px 0;">
 
-            <?php if ( !empty( $history ) ) : ?>
+            <?php if ( ! empty( $history ) ) : ?>
 
                 <table>

trunk/src/includes/extend/buddypress/activity.php

@@ -386 +386 @@
 
         // Bail early if topic is by anonymous user
-        if ( !empty( $anonymous_data ) ) {
+        if ( ! empty( $anonymous_data ) ) {
             return;
         }
 
         // Bail if site is private
-        if ( !bbp_is_site_public() ) {
+        if ( ! bbp_is_site_public() ) {
             return;
         }
@@ -406 +406 @@
 
         // Bail if topic is not published
-        if ( !bbp_is_topic_published( $topic_id ) ) {
+        if ( ! bbp_is_topic_published( $topic_id ) ) {
             return;
         }
@@ -444 +444 @@
 
         // Add the activity entry ID as a meta value to the topic
-        if ( !empty( $activity_id ) ) {
+        if ( ! empty( $activity_id ) ) {
             update_post_meta( $topic_id, '_bbp_activity_id', $activity_id );
         }
@@ -459 +459 @@
         // Get activity ID, bail if it doesn't exist
         $activity_id = $this->get_activity_id( $topic_id );
-        if ( !empty( $activity_id ) ) {
+        if ( ! empty( $activity_id ) ) {
             return bp_activity_delete( array( 'id' => $activity_id ) );
         }
@@ -535 +535 @@
 
         // Do not log activity of anonymous users
-        if ( !empty( $anonymous_data ) ) {
+        if ( ! empty( $anonymous_data ) ) {
             return;
         }
 
         // Bail if site is private
-        if ( !bbp_is_site_public() ) {
+        if ( ! bbp_is_site_public() ) {
             return;
         }
@@ -556 +556 @@
 
         // Bail if reply is not published
-        if ( !bbp_is_reply_published( $reply_id ) ) {
+        if ( ! bbp_is_reply_published( $reply_id ) ) {
             return;
         }
@@ -597 +597 @@
 
         // Add the activity entry ID as a meta value to the reply
-        if ( !empty( $activity_id ) ) {
+        if ( ! empty( $activity_id ) ) {
             update_post_meta( $reply_id, '_bbp_activity_id', $activity_id );
         }
@@ -613 +613 @@
         // Get activity ID, bail if it doesn't exist
         $activity_id = $this->get_activity_id( $reply_id );
-        if ( !empty( $activity_id ) ) {
+        if ( ! empty( $activity_id ) ) {
             return bp_activity_delete( array( 'id' => $activity_id ) );
         }

trunk/src/includes/extend/buddypress/functions.php

@@ -25 +25 @@
 
     // Use existing ID
-    if ( !empty( bbpress()->extend->buddypress->id ) ) {
+    if ( ! empty( bbpress()->extend->buddypress->id ) ) {
         $retval = bbpress()->extend->buddypress->id;
 
@@ -57 +57 @@
 
     // Easy empty checking
-    if ( !empty( $user_id ) && is_numeric( $user_id ) ) {
+    if ( ! empty( $user_id ) && is_numeric( $user_id ) ) {
         $bbp_user_id = $user_id;
     }
 
     // Currently viewing or editing a user
-    elseif ( ( true === $displayed_user_fallback ) && !empty( $did ) ) {
+    elseif ( ( true === $displayed_user_fallback ) && ! empty( $did ) ) {
         $bbp_user_id = $did;
     }
 
     // Maybe fallback on the current_user ID
-    elseif ( ( true === $current_user_fallback ) && !empty( $lid ) ) {
+    elseif ( ( true === $current_user_fallback ) && ! empty( $lid ) ) {
         $bbp_user_id = $lid;
     }
@@ -84 +84 @@
  */
 function bbp_filter_is_single_user( $is = false ) {
-    if ( !empty( $is ) ) {
+    if ( ! empty( $is ) ) {
         return $is;
     }
@@ -101 +101 @@
  */
 function bbp_filter_is_user_home( $is = false ) {
-    if ( !empty( $is ) ) {
+    if ( ! empty( $is ) ) {
         return $is;
     }
@@ -303 +303 @@
 
     // Get the forums
-    if ( !empty( $group_id ) ) {
+    if ( ! empty( $group_id ) ) {
         $forum_ids = groups_get_groupmeta( $group_id, 'forum_id' );
     }
@@ -335 +335 @@
 
     // Get the forums
-    if ( !empty( $forum_id ) ) {
+    if ( ! empty( $forum_id ) ) {
         $group_ids = get_post_meta( $forum_id, '_bbp_group_ids', true );
     }
@@ -406 +406 @@
 
     // Maybe update the groups forums
-    if ( !in_array( $group_id, $group_ids ) ) {
+    if ( ! in_array( $group_id, $group_ids ) ) {
         $group_ids[] = $group_id;
         return bbp_update_forum_group_ids( $forum_id, $group_ids );
@@ -432 +432 @@
 
     // Maybe update the groups forums
-    if ( !in_array( $forum_id, $forum_ids ) ) {
+    if ( ! in_array( $forum_id, $forum_ids ) ) {
         $forum_ids[] = $forum_id;
         return bbp_update_group_forum_ids( $group_id, $forum_ids );
@@ -550 +550 @@
 
     // Check if the forum has groups
-    $retval    = (bool) !empty( $group_ids );
+    $retval    = (bool) ! empty( $group_ids );
 
     return (bool) apply_filters( 'bbp_is_forum_group_forum', $retval, $forum_id, $group_ids );

trunk/src/includes/extend/buddypress/groups.php

@@ -268 +268 @@
 
         // Get the first forum ID
-        if ( !empty( $forum_ids ) ) {
+        if ( ! empty( $forum_ids ) ) {
             $forum_id = (int) is_array( $forum_ids ) ? $forum_ids[0] : $forum_ids;
         }
@@ -345 +345 @@
         }
 
-        $edit_forum = !empty( $_POST['bbp-edit-group-forum'] ) ? true : false;
+        $edit_forum = ! empty( $_POST['bbp-edit-group-forum'] ) ? true : false;
         $forum_id   = 0;
-        $group_id   = !empty( $group_id ) ? $group_id : bp_get_current_group_id();
+        $group_id   = ! empty( $group_id ) ? $group_id : bp_get_current_group_id();
 
         // Keymasters have the ability to reconfigure forums
@@ -359 +359 @@
 
         // Normalize group forum relationships now
-        if ( !empty( $forum_ids ) ) {
+        if ( ! empty( $forum_ids ) ) {
 
             // Loop through forums, and make sure they exist
@@ -414 +414 @@
 
             // If in admin, also include the group ID
-            if ( is_admin() && !empty( $group_id ) ) {
+            if ( is_admin() && ! empty( $group_id ) ) {
                 $new_forum_args['group_id'] = $group_id;
             }
@@ -510 +510 @@
         }
 
-        $create_forum = !empty( $_POST['bbp-create-group-forum'] ) ? true : false;
+        $create_forum = ! empty( $_POST['bbp-create-group-forum'] ) ? true : false;
         $forum_id     = 0;
         $forum_ids    = bbp_get_group_forum_ids( $group_id );
 
-        if ( !empty( $forum_ids ) ) {
+        if ( ! empty( $forum_ids ) ) {
             $forum_id = (int) is_array( $forum_ids ) ? $forum_ids[0] : $forum_ids;
         }
@@ -523 +523 @@
 
                 // Bail if initial content was already created
-                if ( !empty( $forum_id ) ) {
+                if ( ! empty( $forum_id ) ) {
                     return;
                 }
@@ -562 +562 @@
 
                 // Forum was created but is now being undone
-                if ( !empty( $forum_id ) ) {
+                if ( ! empty( $forum_id ) ) {
 
                     // Delete the forum
@@ -618 +618 @@
         // Validate forum_id
         $forum_id = bbp_get_forum_id( $forum_args['forum_id'] );
-        $group_id = !empty( $forum_args['group_id'] ) ? $forum_args['group_id'] : bp_get_current_group_id();
+        $group_id = ! empty( $forum_args['group_id'] ) ? $forum_args['group_id'] : bp_get_current_group_id();
 
         bbp_add_forum_id_to_group( $group_id, $forum_id );
@@ -645 +645 @@
         // Validate forum_id
         $forum_id = bbp_get_forum_id( $forum_args['forum_id'] );
-        $group_id = !empty( $forum_args['group_id'] ) ? $forum_args['group_id'] : bp_get_current_group_id();
+        $group_id = ! empty( $forum_args['group_id'] ) ? $forum_args['group_id'] : bp_get_current_group_id();
 
         bbp_remove_forum_id_from_group( $group_id, $forum_id );
@@ -843 +843 @@
 
                         // Merge
-                        if ( !empty( $_GET['action'] ) && 'merge' === $_GET['action'] ) :
+                        if ( ! empty( $_GET['action'] ) && 'merge' === $_GET['action'] ) :
                             bbp_set_query_name( 'bbp_topic_merge' );
                             bbp_get_template_part( 'form', 'topic-merge' );
 
                         // Split
-                        elseif ( !empty( $_GET['action'] ) && 'split' === $_GET['action'] ) :
+                        elseif ( ! empty( $_GET['action'] ) && 'split' === $_GET['action'] ) :
                             bbp_set_query_name( 'bbp_topic_split' );
                             bbp_get_template_part( 'form', 'topic-split' );
@@ -899 +899 @@
 
                         // Move
-                        if ( !empty( $_GET['action'] ) && ( 'move' === $_GET['action'] ) ) :
+                        if ( ! empty( $_GET['action'] ) && ( 'move' === $_GET['action'] ) ) :
                             bbp_set_query_name( 'bbp_reply_move' );
                             bbp_get_template_part( 'form', 'reply-move' );

trunk/src/includes/extend/buddypress/notifications.php

@@ -56 +56 @@
         $filter = 'bbp_multiple_new_subscription_notification';
     } else {
-        if ( !empty( $secondary_item_id ) ) {
+        if ( ! empty( $secondary_item_id ) ) {
             $text = sprintf( __( 'You have %d new reply to %2$s from %3$s', 'bbpress' ), (int) $total_items, $topic_title, bp_core_get_user_displayname( $secondary_item_id ) );
         } else {
@@ -99 +99 @@
 
     // Bail if somehow this is hooked to an edit action
-    if ( !empty( $is_edit ) ) {
+    if ( ! empty( $is_edit ) ) {
         return;
     }
@@ -108 +108 @@
 
     // Hierarchical replies
-    if ( !empty( $reply_to ) ) {
+    if ( ! empty( $reply_to ) ) {
         $reply_to_item_id = bbp_get_topic_author_id( $reply_to );
     }
@@ -129 +129 @@
  
     // Notify the immediate reply author if not the current reply author
-    if ( !empty( $reply_to ) && ( $author_id !== $reply_to_item_id ) ) {
+    if ( ! empty( $reply_to ) && ( $author_id !== $reply_to_item_id ) ) {
         $args['secondary_item_id'] = $reply_to_item_id ;
 

trunk/src/includes/forums/capabilities.php

@@ -72 +72 @@
                 // Get the post
                 $_post = get_post( $args[0] );
-                if ( !empty( $_post ) ) {
+                if ( ! empty( $_post ) ) {
 
                     // Get caps for post type object
@@ -127 +127 @@
             // Get the post
             $_post = get_post( $args[0] );
-            if ( !empty( $_post ) ) {
+            if ( ! empty( $_post ) ) {
 
                 // Get caps for post type object
@@ -156 +156 @@
             // Get the post
             $_post = get_post( $args[0] );
-            if ( !empty( $_post ) ) {
+            if ( ! empty( $_post ) ) {
 
                 // Get caps for post type object

trunk/src/includes/forums/functions.php

@@ -142 +142 @@
 
     // Remove kses filters from title and content for capable users and if the nonce is verified
-    if ( current_user_can( 'unfiltered_html' ) && !empty( $_POST['_bbp_unfiltered_html_forum'] ) && wp_create_nonce( 'bbp-unfiltered-html-forum_new' ) === $_POST['_bbp_unfiltered_html_forum'] ) {
+    if ( current_user_can( 'unfiltered_html' ) && ! empty( $_POST['_bbp_unfiltered_html_forum'] ) && wp_create_nonce( 'bbp-unfiltered-html-forum_new' ) === $_POST['_bbp_unfiltered_html_forum'] ) {
         remove_filter( 'bbp_new_forum_pre_title',   'wp_filter_kses'      );
         remove_filter( 'bbp_new_forum_pre_content', 'bbp_encode_bad',  10 );
@@ -150 +150 @@
     /** Forum Title ***********************************************************/
 
-    if ( !empty( $_POST['bbp_forum_title'] ) ) {
+    if ( ! empty( $_POST['bbp_forum_title'] ) ) {
         $forum_title = sanitize_text_field( $_POST['bbp_forum_title'] );
     }
@@ -164 +164 @@
     /** Forum Content *********************************************************/
 
-    if ( !empty( $_POST['bbp_forum_content'] ) ) {
+    if ( ! empty( $_POST['bbp_forum_content'] ) ) {
         $forum_content = $_POST['bbp_forum_content'];
     }
@@ -179 +179 @@
 
     // Forum parent was passed (the norm)
-    if ( !empty( $_POST['bbp_forum_parent_id'] ) ) {
+    if ( ! empty( $_POST['bbp_forum_parent_id'] ) ) {
         $forum_parent_id = bbp_get_forum_id( $_POST['bbp_forum_parent_id'] );
     }
@@ -191 +191 @@
 
     // Forum exists
-    } elseif ( !empty( $forum_parent_id ) ) {
+    } elseif ( ! empty( $forum_parent_id ) ) {
 
         // Forum is a category
@@ -216 +216 @@
     /** Forum Flooding ********************************************************/
 
-    if ( !bbp_check_for_flood( $anonymous_data, $forum_author ) ) {
+    if ( ! bbp_check_for_flood( $anonymous_data, $forum_author ) ) {
         bbp_add_error( 'bbp_forum_flood', __( '<strong>ERROR</strong>: Slow down; you move too fast.', 'bbpress' ) );
     }
@@ -222 +222 @@
     /** Forum Duplicate *******************************************************/
 
-    if ( !bbp_check_for_duplicate( array( 'post_type' => bbp_get_forum_post_type(), 'post_author' => $forum_author, 'post_content' => $forum_content, 'anonymous_data' => $anonymous_data ) ) ) {
+    if ( ! bbp_check_for_duplicate( array( 'post_type' => bbp_get_forum_post_type(), 'post_author' => $forum_author, 'post_content' => $forum_content, 'anonymous_data' => $anonymous_data ) ) ) {
         bbp_add_error( 'bbp_forum_duplicate', __( '<strong>ERROR</strong>: This forum already exists.', 'bbpress' ) );
     }
@@ -228 +228 @@
     /** Forum Blacklist *******************************************************/
 
-    if ( !bbp_check_for_blacklist( $anonymous_data, $forum_author, $forum_title, $forum_content ) ) {
+    if ( ! bbp_check_for_blacklist( $anonymous_data, $forum_author, $forum_title, $forum_content ) ) {
         bbp_add_error( 'bbp_forum_blacklist', __( '<strong>ERROR</strong>: Your forum cannot be created at this time.', 'bbpress' ) );
     }
@@ -235 +235 @@
 
     $post_status = bbp_get_public_status_id();
-    if ( !bbp_check_for_moderation( $anonymous_data, $forum_author, $forum_title, $forum_content ) ) {
+    if ( ! bbp_check_for_moderation( $anonymous_data, $forum_author, $forum_title, $forum_content ) ) {
         $post_status = bbp_get_pending_status_id();
     }
@@ -267 +267 @@
     /** No Errors *************************************************************/
 
-    if ( !empty( $forum_id ) && !is_wp_error( $forum_id ) ) {
+    if ( ! empty( $forum_id ) && !is_wp_error( $forum_id ) ) {
 
         /** Trash Check *******************************************************/
@@ -318 +318 @@
 
         // Add view all?
-        if ( bbp_get_view_all() || !empty( $view_all ) ) {
+        if ( bbp_get_view_all() || ! empty( $view_all ) ) {
 
             // User can moderate, so redirect to forum with view all set
@@ -419 +419 @@
 
     // Remove kses filters from title and content for capable users and if the nonce is verified
-    if ( current_user_can( 'unfiltered_html' ) && !empty( $_POST['_bbp_unfiltered_html_forum'] ) && ( wp_create_nonce( 'bbp-unfiltered-html-forum_' . $forum_id ) === $_POST['_bbp_unfiltered_html_forum'] ) ) {
+    if ( current_user_can( 'unfiltered_html' ) && ! empty( $_POST['_bbp_unfiltered_html_forum'] ) && ( wp_create_nonce( 'bbp-unfiltered-html-forum_' . $forum_id ) === $_POST['_bbp_unfiltered_html_forum'] ) ) {
         remove_filter( 'bbp_edit_forum_pre_title',   'wp_filter_kses'      );
         remove_filter( 'bbp_edit_forum_pre_content', 'bbp_encode_bad',  10 );
@@ -428 +428 @@
 
     // Forum parent id was passed
-    if ( !empty( $_POST['bbp_forum_parent_id'] ) ) {
+    if ( ! empty( $_POST['bbp_forum_parent_id'] ) ) {
         $forum_parent_id = bbp_get_forum_id( $_POST['bbp_forum_parent_id'] );
     }
@@ -436 +436 @@
 
     // Forum exists
-    if ( !empty( $forum_parent_id ) && ( $forum_parent_id !== $current_parent_forum_id ) ) {
+    if ( ! empty( $forum_parent_id ) && ( $forum_parent_id !== $current_parent_forum_id ) ) {
 
         // Forum is closed and user cannot access
@@ -456 +456 @@
     /** Forum Title ***********************************************************/
 
-    if ( !empty( $_POST['bbp_forum_title'] ) ) {
+    if ( ! empty( $_POST['bbp_forum_title'] ) ) {
         $forum_title = sanitize_text_field( $_POST['bbp_forum_title'] );
     }
@@ -470 +470 @@
     /** Forum Content *********************************************************/
 
-    if ( !empty( $_POST['bbp_forum_content'] ) ) {
+    if ( ! empty( $_POST['bbp_forum_content'] ) ) {
         $forum_content = $_POST['bbp_forum_content'];
     }
@@ -484 +484 @@
     /** Forum Blacklist *******************************************************/
 
-    if ( !bbp_check_for_blacklist( $anonymous_data, bbp_get_forum_author_id( $forum_id ), $forum_title, $forum_content ) ) {
+    if ( ! bbp_check_for_blacklist( $anonymous_data, bbp_get_forum_author_id( $forum_id ), $forum_title, $forum_content ) ) {
         bbp_add_error( 'bbp_forum_blacklist', __( '<strong>ERROR</strong>: Your forum cannot be edited at this time.', 'bbpress' ) );
     }
@@ -491 +491 @@
 
     $post_status = bbp_get_public_status_id();
-    if ( !bbp_check_for_moderation( $anonymous_data, bbp_get_forum_author_id( $forum_id ), $forum_title, $forum_content ) ) {
+    if ( ! bbp_check_for_moderation( $anonymous_data, bbp_get_forum_author_id( $forum_id ), $forum_title, $forum_content ) ) {
         $post_status = bbp_get_pending_status_id();
     }
@@ -524 +524 @@
      * @todo omitted for 2.1
     // Revision Reason
-    if ( !empty( $_POST['bbp_forum_edit_reason'] ) )
+    if ( ! empty( $_POST['bbp_forum_edit_reason'] ) )
         $forum_edit_reason = sanitize_text_field( $_POST['bbp_forum_edit_reason'] );
 
     // Update revision log
-    if ( !empty( $_POST['bbp_log_forum_edit'] ) && ( "1" === $_POST['bbp_log_forum_edit'] ) && ( $revision_id = wp_save_post_revision( $forum_id ) ) ) {
+    if ( ! empty( $_POST['bbp_log_forum_edit'] ) && ( "1" === $_POST['bbp_log_forum_edit'] ) && ( $revision_id = wp_save_post_revision( $forum_id ) ) ) {
         bbp_update_forum_revision_log( array(
             'forum_id'    => $forum_id,
@@ -540 +540 @@
     /** No Errors *************************************************************/
 
-    if ( !empty( $forum_id ) && !is_wp_error( $forum_id ) ) {
+    if ( ! empty( $forum_id ) && !is_wp_error( $forum_id ) ) {
 
         // Update counts, etc...
@@ -577 +577 @@
 
         // Add view all?
-        if ( !empty( $view_all ) ) {
+        if ( ! empty( $view_all ) ) {
             $forum_url = bbp_add_view_all( $forum_url );
         }
@@ -653 +653 @@
     /** Forum Visibility **************************************************/
 
-    if ( !empty( $_POST['bbp_forum_visibility'] ) && in_array( $_POST['bbp_forum_visibility'], array( bbp_get_public_status_id(), bbp_get_private_status_id(), bbp_get_hidden_status_id() ) ) ) {
+    if ( ! empty( $_POST['bbp_forum_visibility'] ) && in_array( $_POST['bbp_forum_visibility'], array( bbp_get_public_status_id(), bbp_get_private_status_id(), bbp_get_hidden_status_id() ) ) ) {
 
         // Get forums current visibility
@@ -1025 +1025 @@
 
     // Users exist
-    if ( !empty( $users ) ) {
+    if ( ! empty( $users ) ) {
 
         // Loop through users
@@ -1077 +1077 @@
 
         // If has ancestors, loop through them...
-        if ( !empty( $ancestors ) ) {
+        if ( ! empty( $ancestors ) ) {
             foreach ( (array) $ancestors as $parent_forum_id ) {
 
@@ -1168 +1168 @@
 
         // If has ancestors, loop through them...
-        if ( !empty( $ancestors ) ) {
+        if ( ! empty( $ancestors ) ) {
             foreach ( (array) $ancestors as $parent_forum_id ) {
 
@@ -1217 +1217 @@
         // Loop through children and add together forum reply counts
         $children = bbp_forum_query_subforum_ids( $forum_id );
-        if ( !empty( $children ) ) {
+        if ( ! empty( $children ) ) {
             foreach ( $children as $child ) {
                 $children_last_topic = bbp_update_forum_last_topic_id( $child ); // Recursive
@@ -1235 +1235 @@
         // Get the most recent topic in this forum_id
         $recent_topic = get_posts( $post_vars );
-        if ( !empty( $recent_topic ) ) {
+        if ( ! empty( $recent_topic ) ) {
             $topic_id = $recent_topic[0]->ID;
         }
@@ -1245 +1245 @@
 
     // If child forums have higher id, use that instead
-    if ( !empty( $children ) && ( $children_last_topic > $topic_id ) ) {
+    if ( ! empty( $children ) && ( $children_last_topic > $topic_id ) ) {
         $topic_id = $children_last_topic;
     }
@@ -1287 +1287 @@
         // Loop through children and get the most recent reply id
         $children = bbp_forum_query_subforum_ids( $forum_id );
-        if ( !empty( $children ) ) {
+        if ( ! empty( $children ) ) {
             foreach ( $children as $child ) {
                 $children_last_reply = bbp_update_forum_last_reply_id( $child ); // Recursive
@@ -1295 +1295 @@
         // If this forum has topics...
         $topic_ids = bbp_forum_query_topic_ids( $forum_id );
-        if ( !empty( $topic_ids ) ) {
+        if ( ! empty( $topic_ids ) ) {
 
             // ...get the most recent reply from those topics...
@@ -1310 +1310 @@
 
     // If child forums have higher ID, check for newer reply id
-    if ( !empty( $children ) && ( $children_last_reply > $reply_id ) ) {
+    if ( ! empty( $children ) && ( $children_last_reply > $reply_id ) ) {
         $reply_id = $children_last_reply;
     }
@@ -1353 +1353 @@
         // Loop through children and add together forum reply counts
         $children = bbp_forum_query_subforum_ids( $forum_id );
-        if ( !empty( $children ) ) {
+        if ( ! empty( $children ) ) {
             foreach ( $children as $child ) {
                 $children_last_active = bbp_update_forum_last_active_id( $child, $active_id );
@@ -1361 +1361 @@
         // Don't count replies if the forum is a category
         $topic_ids = bbp_forum_query_topic_ids( $forum_id );
-        if ( !empty( $topic_ids ) ) {
+        if ( ! empty( $topic_ids ) ) {
             $active_id = bbp_forum_query_last_reply_id( $forum_id, $topic_ids );
             $active_id = $active_id > max( $topic_ids ) ? $active_id : max( $topic_ids );
@@ -1376 +1376 @@
 
     // If child forums have higher id, use that instead
-    if ( !empty( $children ) && ( $children_last_active > $active_id ) ) {
+    if ( ! empty( $children ) && ( $children_last_active > $active_id ) ) {
         $active_id = $children_last_active;
     }
@@ -1412 +1412 @@
 
     // Update only if there is a time
-    if ( !empty( $new_time ) ) {
+    if ( ! empty( $new_time ) ) {
         update_post_meta( $forum_id, '_bbp_last_active_time', $new_time );
     }
@@ -1467 +1467 @@
     // Loop through subforums and add together forum topic counts
     $children = bbp_forum_query_subforum_ids( $forum_id );
-    if ( !empty( $children ) ) {
+    if ( ! empty( $children ) ) {
         foreach ( $children as $child ) {
             $children_topic_count += bbp_update_forum_topic_count( $child ); // Recursive
@@ -1567 +1567 @@
     // Loop through children and add together forum reply counts
     $children = bbp_forum_query_subforum_ids( $forum_id );
-    if ( !empty( $children ) ) {
+    if ( ! empty( $children ) ) {
         foreach ( (array) $children as $child ) {
             $children_reply_count += bbp_update_forum_reply_count( $child );
@@ -1653 +1653 @@
 
     // Update the parent forum if one was passed
-    if ( !empty( $r['post_parent'] ) && is_numeric( $r['post_parent'] ) ) {
+    if ( ! empty( $r['post_parent'] ) && is_numeric( $r['post_parent'] ) ) {
         bbp_update_forum( array(
             'forum_id'    => $r['post_parent'],
@@ -1792 +1792 @@
 
         // There are forums that need to be excluded
-        if ( !empty( $forum_ids ) ) {
+        if ( ! empty( $forum_ids ) ) {
 
             switch ( $type ) {
@@ -1884 +1884 @@
         if ( ! current_user_can( 'read_private_forums' ) ) {
             $key = array_search( bbp_get_private_status_id(), $post_stati );
-            if ( !empty( $key ) ) {
+            if ( ! empty( $key ) ) {
                 unset( $post_stati[$key] );
             }
@@ -1898 +1898 @@
         if ( ! current_user_can( 'read_hidden_forums' ) ) {
             $key = array_search( bbp_get_hidden_status_id(), $post_stati );
-            if ( !empty( $key ) ) {
+            if ( ! empty( $key ) ) {
                 unset( $post_stati[$key] );
             }
@@ -2012 +2012 @@
         }
 
-        if ( !empty( $topic_ids ) ) {
+        if ( ! empty( $topic_ids ) ) {
             $bbp_db    = bbp_db();
             $topic_ids = implode( ',', wp_parse_id_list( $topic_ids ) );
@@ -2080 +2080 @@
 
     // If forum is explicitly hidden and user not capable, set 404
-    if ( !empty( $forum_id ) && bbp_is_forum_hidden( $forum_id ) && !current_user_can( 'read_hidden_forums' ) ) {
+    if ( ! empty( $forum_id ) && bbp_is_forum_hidden( $forum_id ) && !current_user_can( 'read_hidden_forums' ) ) {
         bbp_set_404();
     }
@@ -2135 +2135 @@
 
     // If forum is explicitly hidden and user not capable, set 404
-    if ( !empty( $forum_id ) && bbp_is_forum_private( $forum_id ) && !current_user_can( 'read_private_forums' ) ) {
+    if ( ! empty( $forum_id ) && bbp_is_forum_private( $forum_id ) && !current_user_can( 'read_private_forums' ) ) {
         bbp_set_404();
     }
@@ -2202 +2202 @@
     // Loop through and delete child topics. Topic replies will get deleted by
     // the bbp_delete_topic() action.
-    if ( !empty( $topics->posts ) ) {
+    if ( ! empty( $topics->posts ) ) {
         foreach ( $topics->posts as $topic ) {
             wp_delete_post( $topic->ID, true );
@@ -2259 +2259 @@
     // Loop through and trash child topics. Topic replies will get trashed by
     // the bbp_trash_topic() action.
-    if ( !empty( $topics->posts ) ) {
+    if ( ! empty( $topics->posts ) ) {
 
         // Prevent debug notices
@@ -2308 +2308 @@
 
     // There are topics to untrash
-    if ( !empty( $pre_trashed_topics ) ) {
+    if ( ! empty( $pre_trashed_topics ) ) {
 
         // Maybe reverse the trashed topics array
@@ -2339 +2339 @@
     $forum_id = bbp_get_forum_id( $forum_id );
 
-    if ( empty( $forum_id ) || !bbp_is_forum( $forum_id ) ) {
+    if ( empty( $forum_id ) || ! bbp_is_forum( $forum_id ) ) {
         return false;
     }
@@ -2361 +2361 @@
     $forum_id = bbp_get_forum_id( $forum_id );
 
-    if ( empty( $forum_id ) || !bbp_is_forum( $forum_id ) ) {
+    if ( empty( $forum_id ) || ! bbp_is_forum( $forum_id ) ) {
         return false;
     }
@@ -2379 +2379 @@
     $forum_id = bbp_get_forum_id( $forum_id );
 
-    if ( empty( $forum_id ) || !bbp_is_forum( $forum_id ) ) {
+    if ( empty( $forum_id ) || ! bbp_is_forum( $forum_id ) ) {
         return false;
     }
@@ -2399 +2399 @@
     $forum_id = bbp_get_forum_id( $forum_id );
 
-    if ( empty( $forum_id ) || !bbp_is_forum( $forum_id ) ) {
+    if ( empty( $forum_id ) || ! bbp_is_forum( $forum_id ) ) {
         return false;
     }
@@ -2417 +2417 @@
     $forum_id = bbp_get_forum_id( $forum_id );
 
-    if ( empty( $forum_id ) || !bbp_is_forum( $forum_id ) ) {
+    if ( empty( $forum_id ) || ! bbp_is_forum( $forum_id ) ) {
         return false;
     }
@@ -2435 +2435 @@
     $forum_id = bbp_get_forum_id( $forum_id );
 
-    if ( empty( $forum_id ) || !bbp_is_forum( $forum_id ) ) {
+    if ( empty( $forum_id ) || ! bbp_is_forum( $forum_id ) ) {
         return false;
     }

trunk/src/includes/replies/capabilities.php

@@ -61 +61 @@
                 // Get the post
                 $_post = get_post( $args[0] );
-                if ( !empty( $_post ) ) {
+                if ( ! empty( $_post ) ) {
 
                     // Get caps for post type object
@@ -116 +116 @@
             // Get the post
             $_post = get_post( $args[0] );
-            if ( !empty( $_post ) ) {
+            if ( ! empty( $_post ) ) {
 
                 // Get caps for post type object
@@ -144 +144 @@
             // Get the post
             $_post = get_post( $args[0] );
-            if ( !empty( $_post ) ) {
+            if ( ! empty( $_post ) ) {
 
                 // Get caps for post type object

trunk/src/includes/replies/functions.php

@@ -129 +129 @@
 
         // Anonymous data checks out, so set cookies, etc...
-        if ( !empty( $anonymous_data ) && is_array( $anonymous_data ) ) {
+        if ( ! empty( $anonymous_data ) && is_array( $anonymous_data ) ) {
             bbp_set_current_anonymous_user_data( $anonymous_data );
         }
@@ -179 +179 @@
 
     // Try to use the forum id of the topic
-    if ( !isset( $_POST['bbp_forum_id'] ) && !empty( $topic_id ) ) {
+    if ( ! isset( $_POST['bbp_forum_id'] ) && ! empty( $topic_id ) ) {
         $forum_id = bbp_get_topic_forum_id( $topic_id );
 
@@ -219 +219 @@
 
     // Forum exists
-    if ( !empty( $forum_id ) ) {
+    if ( ! empty( $forum_id ) ) {
 
         // Forum is a category
@@ -251 +251 @@
 
     // Remove kses filters from title and content for capable users and if the nonce is verified
-    if ( current_user_can( 'unfiltered_html' ) && !empty( $_POST['_bbp_unfiltered_html_reply'] ) && wp_create_nonce( 'bbp-unfiltered-html-reply_' . $topic_id ) === $_POST['_bbp_unfiltered_html_reply'] ) {
+    if ( current_user_can( 'unfiltered_html' ) && ! empty( $_POST['_bbp_unfiltered_html_reply'] ) && wp_create_nonce( 'bbp-unfiltered-html-reply_' . $topic_id ) === $_POST['_bbp_unfiltered_html_reply'] ) {
         remove_filter( 'bbp_new_reply_pre_title',   'wp_filter_kses'      );
         remove_filter( 'bbp_new_reply_pre_content', 'bbp_encode_bad',  10 );
@@ -259 +259 @@
     /** Reply Title ***********************************************************/
 
-    if ( !empty( $_POST['bbp_reply_title'] ) ) {
+    if ( ! empty( $_POST['bbp_reply_title'] ) ) {
         $reply_title = sanitize_text_field( $_POST['bbp_reply_title'] );
     }
@@ -268 +268 @@
     /** Reply Content *********************************************************/
 
-    if ( !empty( $_POST['bbp_reply_content'] ) ) {
+    if ( ! empty( $_POST['bbp_reply_content'] ) ) {
         $reply_content = $_POST['bbp_reply_content'];
     }
@@ -282 +282 @@
     /** Reply Flooding ********************************************************/
 
-    if ( !bbp_check_for_flood( $anonymous_data, $reply_author ) ) {
+    if ( ! bbp_check_for_flood( $anonymous_data, $reply_author ) ) {
         bbp_add_error( 'bbp_reply_flood', __( '<strong>ERROR</strong>: Slow down; you move too fast.', 'bbpress' ) );
     }
@@ -288 +288 @@
     /** Reply Duplicate *******************************************************/
 
-    if ( !bbp_check_for_duplicate( array( 'post_type' => bbp_get_reply_post_type(), 'post_author' => $reply_author, 'post_content' => $reply_content, 'post_parent' => $topic_id, 'anonymous_data' => $anonymous_data ) ) ) {
+    if ( ! bbp_check_for_duplicate( array( 'post_type' => bbp_get_reply_post_type(), 'post_author' => $reply_author, 'post_content' => $reply_content, 'post_parent' => $topic_id, 'anonymous_data' => $anonymous_data ) ) ) {
         bbp_add_error( 'bbp_reply_duplicate', __( '<strong>ERROR</strong>: Duplicate reply detected; it looks as though you&#8217;ve already said that!', 'bbpress' ) );
     }
@@ -294 +294 @@
     /** Reply Blacklist *******************************************************/
 
-    if ( !bbp_check_for_blacklist( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) {
+    if ( ! bbp_check_for_blacklist( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) {
         bbp_add_error( 'bbp_reply_blacklist', __( '<strong>ERROR</strong>: Your reply cannot be created at this time.', 'bbpress' ) );
     }
@@ -301 +301 @@
 
     // Maybe put into moderation
-    if ( !bbp_check_for_moderation( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) {
+    if ( ! bbp_check_for_moderation( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) {
         $reply_status = bbp_get_pending_status_id();
 
@@ -368 +368 @@
 
     // Check for missing reply_id or error
-    if ( !empty( $reply_id ) && !is_wp_error( $reply_id ) ) {
+    if ( ! empty( $reply_id ) && !is_wp_error( $reply_id ) ) {
 
         /** Topic Tags ********************************************************/
@@ -547 +547 @@
 
     // Remove kses filters from title and content for capable users and if the nonce is verified
-    if ( current_user_can( 'unfiltered_html' ) && !empty( $_POST['_bbp_unfiltered_html_reply'] ) && wp_create_nonce( 'bbp-unfiltered-html-reply_' . $reply_id ) === $_POST['_bbp_unfiltered_html_reply'] ) {
+    if ( current_user_can( 'unfiltered_html' ) && ! empty( $_POST['_bbp_unfiltered_html_reply'] ) && wp_create_nonce( 'bbp-unfiltered-html-reply_' . $reply_id ) === $_POST['_bbp_unfiltered_html_reply'] ) {
         remove_filter( 'bbp_edit_reply_pre_title',   'wp_filter_kses'      );
         remove_filter( 'bbp_edit_reply_pre_content', 'bbp_encode_bad',  10 );
@@ -562 +562 @@
 
     // Forum exists
-    if ( !empty( $forum_id ) && ( $forum_id !== bbp_get_reply_forum_id( $reply_id ) ) ) {
+    if ( ! empty( $forum_id ) && ( $forum_id !== bbp_get_reply_forum_id( $reply_id ) ) ) {
 
         // Forum is a category
@@ -593 +593 @@
     /** Reply Title ***********************************************************/
 
-    if ( !empty( $_POST['bbp_reply_title'] ) ) {
+    if ( ! empty( $_POST['bbp_reply_title'] ) ) {
         $reply_title = sanitize_text_field( $_POST['bbp_reply_title'] );
     }
@@ -602 +602 @@
     /** Reply Content *********************************************************/
 
-    if ( !empty( $_POST['bbp_reply_content'] ) ) {
+    if ( ! empty( $_POST['bbp_reply_content'] ) ) {
         $reply_content = $_POST['bbp_reply_content'];
     }
@@ -616 +616 @@
     /** Reply Blacklist *******************************************************/
 
-    if ( !bbp_check_for_blacklist( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) {
+    if ( ! bbp_check_for_blacklist( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) {
         bbp_add_error( 'bbp_reply_blacklist', __( '<strong>ERROR</strong>: Your reply cannot be edited at this time.', 'bbpress' ) );
     }
@@ -623 +623 @@
 
     // Maybe put into moderation
-    if ( !bbp_check_for_moderation( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) {
+    if ( ! bbp_check_for_moderation( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) {
 
         // Set post status to pending if public
@@ -711 +711 @@
 
     // Revision Reason
-    if ( !empty( $_POST['bbp_reply_edit_reason'] ) ) {
+    if ( ! empty( $_POST['bbp_reply_edit_reason'] ) ) {
         $reply_edit_reason = sanitize_text_field( $_POST['bbp_reply_edit_reason'] );
     }
 
     // Update revision log
-    if ( !empty( $_POST['bbp_log_reply_edit'] ) && ( "1" === $_POST['bbp_log_reply_edit'] ) ) {
+    if ( ! empty( $_POST['bbp_log_reply_edit'] ) && ( "1" === $_POST['bbp_log_reply_edit'] ) ) {
         $revision_id = wp_save_post_revision( $reply_id );
-        if ( !empty( $revision_id ) ) {
+        if ( ! empty( $revision_id ) ) {
             bbp_update_reply_revision_log( array(
                 'reply_id'    => $reply_id,
@@ -730 +730 @@
     /** No Errors *************************************************************/
 
-    if ( !empty( $reply_id ) && !is_wp_error( $reply_id ) ) {
+    if ( ! empty( $reply_id ) && !is_wp_error( $reply_id ) ) {
 
         // Update counts, etc...
@@ -816 +816 @@
 
     // Check forum_id
-    if ( !empty( $topic_id ) && empty( $forum_id ) ) {
+    if ( ! empty( $topic_id ) && empty( $forum_id ) ) {
         $forum_id = bbp_get_topic_forum_id( $topic_id );
     }
@@ -823 +823 @@
     // It expects anonymous_data to be sanitized.
     // Check bbp_filter_anonymous_post_data() for sanitization.
-    if ( !empty( $anonymous_data ) && is_array( $anonymous_data ) ) {
+    if ( ! empty( $anonymous_data ) && is_array( $anonymous_data ) ) {
 
         // Parse arguments against default values
@@ -849 +849 @@
 
     // Handle Subscription Checkbox
-    if ( bbp_is_subscriptions_active() && !empty( $author_id ) && !empty( $topic_id ) ) {
+    if ( bbp_is_subscriptions_active() && ! empty( $author_id ) && ! empty( $topic_id ) ) {
         $subscribed = bbp_is_user_subscribed( $author_id, $topic_id );
-        $subscheck  = ( !empty( $_POST['bbp_topic_subscription'] ) && ( 'bbp_subscribe' === $_POST['bbp_topic_subscription'] ) ) ? true : false;
+        $subscheck  = ( ! empty( $_POST['bbp_topic_subscription'] ) && ( 'bbp_subscribe' === $_POST['bbp_topic_subscription'] ) ) ? true : false;
 
         // Subscribed and unsubscribing
@@ -922 +922 @@
 
     // Reply was passed
-    if ( !empty( $reply_id ) ) {
+    if ( ! empty( $reply_id ) ) {
 
         // Get the topic ID if none was passed
@@ -947 +947 @@
 
     // Walk up ancestors
-    if ( !empty( $ancestors ) ) {
+    if ( ! empty( $ancestors ) ) {
         foreach ( $ancestors as $ancestor ) {
 
@@ -1036 +1036 @@
 
         // Loop through ancestors
-        if ( !empty( $ancestors ) ) {
+        if ( ! empty( $ancestors ) ) {
             foreach ( $ancestors as $ancestor ) {
 
@@ -1085 +1085 @@
 
         // Loop through ancestors
-        if ( !empty( $ancestors ) ) {
+        if ( ! empty( $ancestors ) ) {
             foreach ( $ancestors as $ancestor ) {
 
@@ -1311 +1311 @@
 
     // How to move
-    if ( !empty( $_POST['bbp_reply_move_option'] ) ) {
+    if ( ! empty( $_POST['bbp_reply_move_option'] ) ) {
         $move_option = (string) trim( $_POST['bbp_reply_move_option'] );
     }
 
     // Invalid move option
-    if ( empty( $move_option ) || !in_array( $move_option, array( 'existing', 'topic' ) ) ) {
+    if ( empty( $move_option ) || ! in_array( $move_option, array( 'existing', 'topic' ) ) ) {
         bbp_add_error( 'bbp_move_reply_option', __( '<strong>ERROR</strong>: You need to choose a valid move option.', 'bbpress' ) );
 
@@ -1375 +1375 @@
 
                     // Use the new title that was passed
-                    if ( !empty( $_POST['bbp_reply_move_destination_title'] ) ) {
+                    if ( ! empty( $_POST['bbp_reply_move_destination_title'] ) ) {
                         $destination_topic_title = sanitize_text_field( $_POST['bbp_reply_move_destination_title'] );
 
@@ -1570 +1570 @@
 
     // Bail if actions aren't meant for this function
-    if ( !in_array( $action, $possible_actions ) ) {
+    if ( ! in_array( $action, $possible_actions ) ) {
         return;
     }
@@ -1602 +1602 @@
             $success    = $is_approve ? bbp_approve_reply( $reply_id ) : bbp_unapprove_reply( $reply_id );
             $failure    = $is_approve ? __( '<strong>ERROR</strong>: There was a problem approving the reply!', 'bbpress' ) : __( '<strong>ERROR</strong>: There was a problem unapproving the reply!', 'bbpress' );
-            $view_all   = !$is_approve;
+            $view_all   = ! $is_approve;
 
             break;
@@ -1613 +1613 @@
             $success  = $is_spam ? bbp_unspam_reply( $reply_id ) : bbp_spam_reply( $reply_id );
             $failure  = $is_spam ? __( '<strong>ERROR</strong>: There was a problem unmarking the reply as spam!', 'bbpress' ) : __( '<strong>ERROR</strong>: There was a problem marking the reply as spam!', 'bbpress' );
-            $view_all = !$is_spam;
+            $view_all = ! $is_spam;
 
             break;
@@ -1671 +1671 @@
 
         // Add view all if needed
-        if ( !empty( $view_all ) ) {
+        if ( ! empty( $view_all ) ) {
             $reply_url = bbp_add_view_all( $reply_url, true );
         }
@@ -1911 +1911 @@
     $reply_id = bbp_get_reply_id( $reply_id );
 
-    if ( empty( $reply_id ) || !bbp_is_reply( $reply_id ) ) {
+    if ( empty( $reply_id ) || ! bbp_is_reply( $reply_id ) ) {
         return false;
     }
@@ -1928 +1928 @@
     $reply_id = bbp_get_reply_id( $reply_id );
 
-    if ( empty( $reply_id ) || !bbp_is_reply( $reply_id ) ) {
+    if ( empty( $reply_id ) || ! bbp_is_reply( $reply_id ) ) {
         return false;
     }
@@ -1945 +1945 @@
     $reply_id = bbp_get_reply_id( $reply_id );
 
-    if ( empty( $reply_id ) || !bbp_is_reply( $reply_id ) ) {
+    if ( empty( $reply_id ) || ! bbp_is_reply( $reply_id ) ) {
         return false;
     }
@@ -1964 +1964 @@
     $reply_id = bbp_get_reply_id( $reply_id );
 
-    if ( empty( $reply_id ) || !bbp_is_reply( $reply_id ) ) {
+    if ( empty( $reply_id ) || ! bbp_is_reply( $reply_id ) ) {
         return false;
     }
@@ -1981 +1981 @@
     $reply_id = bbp_get_reply_id( $reply_id );
 
-    if ( empty( $reply_id ) || !bbp_is_reply( $reply_id ) ) {
+    if ( empty( $reply_id ) || ! bbp_is_reply( $reply_id ) ) {
         return false;
     }
@@ -1998 +1998 @@
     $reply_id = bbp_get_reply_id( $reply_id );
 
-    if ( empty( $reply_id ) || !bbp_is_reply( $reply_id ) ) {
+    if ( empty( $reply_id ) || ! bbp_is_reply( $reply_id ) ) {
         return false;
     }
@@ -2176 +2176 @@
 
     // User cannot access forum this topic is in
-    if ( bbp_is_single_topic() && !bbp_user_can_view_forum( array( 'forum_id' => bbp_get_topic_forum_id() ) ) ) {
+    if ( bbp_is_single_topic() && ! bbp_user_can_view_forum( array( 'forum_id' => bbp_get_topic_forum_id() ) ) ) {
         return;
     }
@@ -2183 +2183 @@
     if ( bbp_is_single_topic() && bbp_user_can_view_forum( array( 'forum_id' => bbp_get_topic_forum_id() ) ) ) {
         $title = apply_filters( 'wp_title_rss', get_wp_title_rss( ' &#187; ' ) );
-    } elseif ( !bbp_show_lead_topic() ) {
+    } elseif ( ! bbp_show_lead_topic() ) {
         $title = ' &#187; ' .  __( 'All Posts',   'bbpress' );
     } else {
@@ -2368 +2368 @@
     // Get required data
     $reply_id       = bbp_get_reply_id( $reply_id );
-    $topic_id       = !empty( $topic_id ) ? bbp_get_topic_id( $topic_id ) : bbp_get_reply_topic_id( $reply_id );
+    $topic_id       = ! empty( $topic_id ) ? bbp_get_topic_id( $topic_id ) : bbp_get_reply_topic_id( $reply_id );
     $reply_position = 0;
 
@@ -2376 +2376 @@
         // Make sure the topic has replies before running another query
         $reply_count = bbp_get_topic_reply_count( $topic_id, false );
-        if ( !empty( $reply_count ) ) {
+        if ( ! empty( $reply_count ) ) {
 
             // Get reply id's
             $topic_replies = bbp_get_all_child_ids( $topic_id, bbp_get_reply_post_type() );
-            if ( !empty( $topic_replies ) ) {
+            if ( ! empty( $topic_replies ) ) {
 
                 // Reverse replies array and search for current reply position

trunk/src/includes/replies/template.php

@@ -351 +351 @@
 
         // Easy empty checking
-        if ( !empty( $reply_id ) && is_numeric( $reply_id ) ) {
+        if ( ! empty( $reply_id ) && is_numeric( $reply_id ) ) {
             $bbp_reply_id = $reply_id;
 
         // Currently inside a replies loop
-        } elseif ( !empty( $bbp->reply_query->in_the_loop ) && isset( $bbp->reply_query->post->ID ) ) {
+        } elseif ( ! empty( $bbp->reply_query->in_the_loop ) && isset( $bbp->reply_query->post->ID ) ) {
             $bbp_reply_id = $bbp->reply_query->post->ID;
 
         // Currently inside a search loop
-        } elseif ( !empty( $bbp->search_query->in_the_loop ) && isset( $bbp->search_query->post->ID ) && bbp_is_reply( $bbp->search_query->post->ID ) ) {
+        } elseif ( ! empty( $bbp->search_query->in_the_loop ) && isset( $bbp->search_query->post->ID ) && bbp_is_reply( $bbp->search_query->post->ID ) ) {
             $bbp_reply_id = $bbp->search_query->post->ID;
 
         // Currently viewing a forum
-        } elseif ( ( bbp_is_single_reply() || bbp_is_reply_edit() ) && !empty( $bbp->current_reply_id ) ) {
+        } elseif ( ( bbp_is_single_reply() || bbp_is_reply_edit() ) && ! empty( $bbp->current_reply_id ) ) {
             $bbp_reply_id = $bbp->current_reply_id;
 
@@ -663 +663 @@
         }
 
-        if ( !empty( $length ) && ( $excerpt_length > $length ) ) {
+        if ( ! empty( $length ) && ( $excerpt_length > $length ) ) {
             $excerpt  = substr( $excerpt, 0, $length - 1 );
             $excerpt .= '…';
@@ -701 +701 @@
 
         // 4 days, 4 hours ago
-        if ( !empty( $humanize ) ) {
-            $gmt_s  = !empty( $gmt ) ? 'G' : 'U';
+        if ( ! empty( $humanize ) ) {
+            $gmt_s  = ! empty( $gmt ) ? 'G' : 'U';
             $date   = get_post_time( $gmt_s, $gmt, $reply_id );
             $time   = false; // For filter below
@@ -811 +811 @@
 
             $r .= "\t" . '<li id="bbp-reply-revision-log-' . esc_attr( $reply_id ) . '-item-' . esc_attr( $revision->ID ) . '" class="bbp-reply-revision-log-item">' . "\n";
-            if ( !empty( $reason ) ) {
+            if ( ! empty( $reason ) ) {
                 $r .= "\t\t" . sprintf( esc_html__( 'This reply was modified %1$s by %2$s. Reason: %3$s', 'bbpress' ), esc_html( $since ), $author, esc_html( $reason ) ) . "\n";
             } else {
@@ -1181 +1181 @@
     function bbp_get_reply_author_avatar( $reply_id = 0, $size = 40 ) {
         $reply_id = bbp_get_reply_id( $reply_id );
-        if ( !empty( $reply_id ) ) {
+        if ( ! empty( $reply_id ) ) {
             // Check for anonymous user
-            if ( !bbp_is_reply_anonymous( $reply_id ) ) {
+            if ( ! bbp_is_reply_anonymous( $reply_id ) ) {
                 $author_avatar = get_avatar( bbp_get_reply_author_id( $reply_id ), $size );
             } else {
@@ -1245 +1245 @@
 
         // Reply ID is good
-        if ( !empty( $reply_id ) ) {
+        if ( ! empty( $reply_id ) ) {
 
             // Get some useful reply information
@@ -1261 +1261 @@
 
             // Setup title and author_links array
-            $link_title   = !empty( $link_title ) ? ' title="' . esc_attr( $link_title ) . '"' : '';
+            $link_title   = ! empty( $link_title ) ? ' title="' . esc_attr( $link_title ) . '"' : '';
             $author_links = array();
 
@@ -1385 +1385 @@
             $user_id      = bbp_get_reply_author_id( $reply_id );
             $user         = get_userdata( $user_id );
-            $author_email = !empty( $user->user_email ) ? $user->user_email : '';
+            $author_email = ! empty( $user->user_email ) ? $user->user_email : '';
 
         // Anonymous
@@ -1755 +1755 @@
 
         // Set visibility
-        $style  = !empty( $reply_to ) ? '' : ' style="display:none;"';
+        $style  = ! empty( $reply_to ) ? '' : ' style="display:none;"';
         $link   = remove_query_arg( array( 'bbp_reply_to', '_wpnonce' ) ) . '#post-' . $reply_to;
         $retval = '<a rel="nofollow" id="bbp-cancel-reply-to-link" href="' . esc_url( $link ) . '"' . $style . '>' . esc_html( $text ) . '</a>';
@@ -1800 +1800 @@
         // Reply doesn't have a position so get the raw value
         if ( empty( $reply_position ) ) {
-            $topic_id = !empty( $topic_id ) ? bbp_get_topic_id( $topic_id ) : bbp_get_reply_topic_id( $reply_id );
+            $topic_id = ! empty( $topic_id ) ? bbp_get_topic_id( $topic_id ) : bbp_get_reply_topic_id( $reply_id );
 
             // Post is not the topic
@@ -1808 +1808 @@
                 // Update the reply position in the posts table so we'll never have
                 // to hit the DB again.
-                if ( !empty( $reply_position ) ) {
+                if ( ! empty( $reply_position ) ) {
                     bbp_update_reply_position( $reply_id, $reply_position );
                 }
@@ -2520 +2520 @@
         $bbp = bbpress();
 
-        if ( !isset( $bbp->reply_query->pagination_links ) || empty( $bbp->reply_query->pagination_links ) ) {
+        if ( ! isset( $bbp->reply_query->pagination_links ) || empty( $bbp->reply_query->pagination_links ) ) {
             return false;
         }

trunk/src/includes/topics/functions.php

@@ -1195 +1195 @@
 
     // Source topic not found
-    } elseif ( !$source_topic = bbp_get_topic( $source_topic_id ) ) {
+    } elseif ( ! $source_topic = bbp_get_topic( $source_topic_id ) ) {
         bbp_add_error( 'bbp_merge_topic_source_not_found', __( '<strong>ERROR</strong>: The topic you want to merge was not found.', 'bbpress' ) );
         return;
@@ -1216 +1216 @@
 
     // Destination topic not found
-    if ( !$destination_topic = bbp_get_topic( $destination_topic_id ) ) {
+    if ( ! $destination_topic = bbp_get_topic( $destination_topic_id ) ) {
         bbp_add_error( 'bbp_merge_topic_destination_not_found', __( '<strong>ERROR</strong>: The topic you want to merge to was not found.', 'bbpress' ) );
     }
@@ -1872 +1872 @@
 
             // No tag name was provided
-            if ( empty( $_POST['tag-name'] ) || !$name = $_POST['tag-name'] ) {
+            if ( empty( $_POST['tag-name'] ) || ! $name = $_POST['tag-name'] ) {
                 bbp_add_error( 'bbp_manage_topic_tag_update_name', __( '<strong>ERROR</strong>: You need to enter a tag name.', 'bbpress' ) );
                 return;
@@ -1912 +1912 @@
 
             // No tag name was provided
-            if ( empty( $_POST['tag-existing-name'] ) || !$name = $_POST['tag-existing-name'] ) {
+            if ( empty( $_POST['tag-existing-name'] ) || ! $name = $_POST['tag-existing-name'] ) {
                 bbp_add_error( 'bbp_manage_topic_tag_merge_name', __( '<strong>ERROR</strong>: You need to enter a tag name.', 'bbpress' ) );
                 return;
@@ -1918 +1918 @@
 
             // If term does not exist, create it
-            if ( !$tag = term_exists( $name, bbp_get_topic_tag_tax_id() ) ) {
+            if ( ! $tag = term_exists( $name, bbp_get_topic_tag_tax_id() ) ) {
                 $tag = wp_insert_term( $name, bbp_get_topic_tag_tax_id() );
             }
@@ -2178 +2178 @@
             $success  = true === $is_spam ? bbp_unspam_topic( $topic_id ) : bbp_spam_topic( $topic_id );
             $failure  = true === $is_spam ? __( '<strong>ERROR</strong>: There was a problem unmarking the topic as spam.', 'bbpress' ) : __( '<strong>ERROR</strong>: There was a problem marking the topic as spam.', 'bbpress' );
-            $view_all = !$is_spam;
+            $view_all = ! $is_spam;
 
             break;

trunk/src/templates/default/bbpress-functions.php

@@ -356 +356 @@
         // Get user and topic data
         $user_id = bbp_get_current_user_id();
-        $id      = !empty( $_POST['id'] ) ? intval( $_POST['id'] ) : 0;
+        $id      = ! empty( $_POST['id'] ) ? intval( $_POST['id'] ) : 0;
 
         // Bail if user cannot add favorites for this user

trunk/src/templates/default/bbpress/content-single-forum.php

@@ -32 +32 @@
         <?php endif; ?>
 
-        <?php if ( !bbp_is_forum_category() && bbp_has_topics() ) : ?>
+        <?php if ( ! bbp_is_forum_category() && bbp_has_topics() ) : ?>
 
             <?php bbp_get_template_part( 'pagination', 'topics'    ); ?>
@@ -42 +42 @@
             <?php bbp_get_template_part( 'form',       'topic'     ); ?>
 
-        <?php elseif ( !bbp_is_forum_category() ) : ?>
+        <?php elseif ( ! bbp_is_forum_category() ) : ?>
 
             <?php bbp_get_template_part( 'feedback',   'no-topics' ); ?>

trunk/src/templates/default/bbpress/content-statistics.php

@@ -40 +40 @@
     </dd>
 
-    <?php if ( !empty( $stats['empty_topic_tag_count'] ) ) : ?>
+    <?php if ( ! empty( $stats['empty_topic_tag_count'] ) ) : ?>
 
         <dt><?php esc_html_e( 'Empty Topic Tags', 'bbpress' ); ?></dt>
@@ -49 +49 @@
     <?php endif; ?>
 
-    <?php if ( !empty( $stats['topic_count_hidden'] ) ) : ?>
+    <?php if ( ! empty( $stats['topic_count_hidden'] ) ) : ?>
 
         <dt><?php esc_html_e( 'Hidden Topics', 'bbpress' ); ?></dt>
@@ -60 +60 @@
     <?php endif; ?>
 
-    <?php if ( !empty( $stats['reply_count_hidden'] ) ) : ?>
+    <?php if ( ! empty( $stats['reply_count_hidden'] ) ) : ?>
 
         <dt><?php esc_html_e( 'Hidden Replies', 'bbpress' ); ?></dt>

trunk/src/templates/default/bbpress/form-forum.php

@@ -43 +43 @@
                 <?php do_action( 'bbp_theme_before_forum_form_notices' ); ?>
 
-                <?php if ( !bbp_is_forum_edit() && bbp_is_forum_closed() ) : ?>
+                <?php if ( ! bbp_is_forum_edit() && bbp_is_forum_closed() ) : ?>
 
                     <div class="bbp-template-notice">

trunk/src/templates/default/bbpress/form-reply.php

@@ -29 +29 @@
                 <?php do_action( 'bbp_theme_before_reply_form_notices' ); ?>
 
-                <?php if ( !bbp_is_topic_open() && !bbp_is_reply_edit() ) : ?>
+                <?php if ( ! bbp_is_topic_open() && ! bbp_is_reply_edit() ) : ?>
 
                     <div class="bbp-template-notice">
@@ -83 +83 @@
                     <?php endif; ?>
 
-                    <?php if ( bbp_is_subscriptions_active() && !bbp_is_anonymous() && ( !bbp_is_reply_edit() || ( bbp_is_reply_edit() && !bbp_is_reply_anonymous() ) ) ) : ?>
+                    <?php if ( bbp_is_subscriptions_active() && ! bbp_is_anonymous() && ( ! bbp_is_reply_edit() || ( bbp_is_reply_edit() && ! bbp_is_reply_anonymous() ) ) ) : ?>
 
                         <?php do_action( 'bbp_theme_before_reply_form_subscription' ); ?>

trunk/src/templates/default/bbpress/form-topic.php

@@ -49 +49 @@
                 <?php do_action( 'bbp_theme_before_topic_form_notices' ); ?>
 
-                <?php if ( !bbp_is_topic_edit() && bbp_is_forum_closed() ) : ?>
+                <?php if ( ! bbp_is_topic_edit() && bbp_is_forum_closed() ) : ?>
 
                     <div class="bbp-template-notice">
@@ -112 +112 @@
                     <?php endif; ?>
 
-                    <?php if ( !bbp_is_single_forum() ) : ?>
+                    <?php if ( ! bbp_is_single_forum() ) : ?>
 
                         <?php do_action( 'bbp_theme_before_topic_form_forum' ); ?>
@@ -158 +158 @@
                     <?php endif; ?>
 
-                    <?php if ( bbp_is_subscriptions_active() && !bbp_is_anonymous() && ( !bbp_is_topic_edit() || ( bbp_is_topic_edit() && !bbp_is_topic_anonymous() ) ) ) : ?>
+                    <?php if ( bbp_is_subscriptions_active() && ! bbp_is_anonymous() && ( ! bbp_is_topic_edit() || ( bbp_is_topic_edit() && ! bbp_is_topic_anonymous() ) ) ) : ?>
 
                         <?php do_action( 'bbp_theme_before_topic_form_subscriptions' ); ?>
@@ -250 +250 @@
 <?php endif; ?>
 
-<?php if ( !bbp_is_single_forum() ) : ?>
+<?php if ( ! bbp_is_single_forum() ) : ?>
 
 </div>

trunk/src/templates/default/bbpress/loop-single-topic.php

@@ -61 +61 @@
             <?php do_action( 'bbp_theme_after_topic_started_by' ); ?>
 
-            <?php if ( !bbp_is_single_forum() || ( bbp_get_topic_forum_id() !== bbp_get_forum_id() ) ) : ?>
+            <?php if ( ! bbp_is_single_forum() || ( bbp_get_topic_forum_id() !== bbp_get_forum_id() ) ) : ?>
 
                 <?php do_action( 'bbp_theme_before_topic_started_in' ); ?>