Changeset 6196
- Timestamp:
- 12/28/2016 06:16:53 PM (9 years ago)
- Location:
- trunk/src/includes
- Files:
-
- 15 edited
-
admin/converters/e107v1.php (modified) (1 diff)
-
admin/tools.php (modified) (3 diffs)
-
common/functions.php (modified) (1 diff)
-
common/shortcodes.php (modified) (8 diffs)
-
common/template.php (modified) (1 diff)
-
common/widgets.php (modified) (3 diffs)
-
core/theme-compat.php (modified) (1 diff)
-
extend/buddypress/functions.php (modified) (2 diffs)
-
extend/buddypress/groups.php (modified) (2 diffs)
-
extend/buddypress/loader.php (modified) (1 diff)
-
forums/capabilities.php (modified) (1 diff)
-
forums/functions.php (modified) (5 diffs)
-
replies/functions.php (modified) (2 diffs)
-
replies/template.php (modified) (1 diff)
-
users/functions.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/includes/admin/converters/e107v1.php
r6191 r6196 582 582 } 583 583 584 if ( ! is_null( $row ) ) {584 if ( ! is_null( $row ) ) { 585 585 $this->map_userid[ $field ] = $row->value_id; 586 586 } else { -
trunk/src/includes/admin/tools.php
r6193 r6196 1554 1554 $values = array(); 1555 1555 foreach ( $users as $user ) { 1556 if ( empty( $user->favorites ) || ! is_string( $user->favorites ) ) {1556 if ( empty( $user->favorites ) || ! is_string( $user->favorites ) ) { 1557 1557 continue; 1558 1558 } 1559 1559 1560 1560 $favorites = array_intersect( $topics, explode( ',', $user->favorites ) ); 1561 if ( empty( $favorites ) || ! is_array( $favorites ) ) {1561 if ( empty( $favorites ) || ! is_array( $favorites ) ) { 1562 1562 continue; 1563 1563 } … … 1623 1623 $values = array(); 1624 1624 foreach ( $users as $user ) { 1625 if ( empty( $user->subscriptions ) || ! is_string( $user->subscriptions ) ) {1625 if ( empty( $user->subscriptions ) || ! is_string( $user->subscriptions ) ) { 1626 1626 continue; 1627 1627 } 1628 1628 1629 1629 $subscriptions = array_intersect( $topics, explode( ',', $user->subscriptions ) ); 1630 if ( empty( $subscriptions ) || ! is_array( $subscriptions ) ) {1630 if ( empty( $subscriptions ) || ! is_array( $subscriptions ) ) { 1631 1631 continue; 1632 1632 } … … 1692 1692 $values = array(); 1693 1693 foreach ( $users as $user ) { 1694 if ( empty( $user->subscriptions ) || ! is_string( $user->subscriptions ) ) {1694 if ( empty( $user->subscriptions ) || ! is_string( $user->subscriptions ) ) { 1695 1695 continue; 1696 1696 } 1697 1697 1698 1698 $subscriptions = array_intersect( $forums, explode( ',', $user->subscriptions ) ); 1699 if ( empty( $subscriptions ) || ! is_array( $subscriptions ) ) {1699 if ( empty( $subscriptions ) || ! is_array( $subscriptions ) ) { 1700 1700 continue; 1701 1701 } -
trunk/src/includes/common/functions.php
r6191 r6196 126 126 ); 127 127 128 if ( ! empty( $older_date ) && ! is_numeric( $older_date ) ) {128 if ( ! empty( $older_date ) && ! is_numeric( $older_date ) ) { 129 129 $time_chunks = explode( ':', str_replace( ' ', ':', $older_date ) ); 130 130 $date_chunks = explode( '-', str_replace( ' ', '-', $older_date ) ); -
trunk/src/includes/common/shortcodes.php
r5957 r6196 223 223 224 224 // Sanity check required info 225 if ( ! empty( $content ) || ( empty( $attr['id'] ) || ! is_numeric( $attr['id'] ) ) ) {225 if ( ! empty( $content ) || ( empty( $attr['id'] ) || ! is_numeric( $attr['id'] ) ) ) { 226 226 return $content; 227 227 } … … 317 317 318 318 // Sanity check required info 319 if ( ! empty( $content ) || ( empty( $attr['id'] ) || ! is_numeric( $attr['id'] ) ) ) {319 if ( ! empty( $content ) || ( empty( $attr['id'] ) || ! is_numeric( $attr['id'] ) ) ) { 320 320 return $content; 321 321 } … … 383 383 384 384 // Sanity check supplied info 385 if ( ! empty( $content ) || ( ! empty( $attr['forum_id'] ) && ( ! is_numeric( $attr['forum_id'] ) || ! bbp_is_forum( $attr['forum_id'] ) ) ) ) {385 if ( ! empty( $content ) || ( ! empty( $attr['forum_id'] ) && ( ! is_numeric( $attr['forum_id'] ) || ! bbp_is_forum( $attr['forum_id'] ) ) ) ) { 386 386 return $content; 387 387 } … … 438 438 439 439 // Sanity check required info 440 if ( ! empty( $content ) || ( empty( $attr['id'] ) || ! is_numeric( $attr['id'] ) ) ) {440 if ( ! empty( $content ) || ( empty( $attr['id'] ) || ! is_numeric( $attr['id'] ) ) ) { 441 441 return $content; 442 442 } … … 550 550 551 551 // Sanity check required info 552 if ( ! empty( $content ) || ( empty( $attr['id'] ) || ! is_numeric( $attr['id'] ) ) ) {552 if ( ! empty( $content ) || ( empty( $attr['id'] ) || ! is_numeric( $attr['id'] ) ) ) { 553 553 return $content; 554 554 } … … 734 734 735 735 // Output templates 736 if ( ! is_user_logged_in() ) {736 if ( ! is_user_logged_in() ) { 737 737 bbp_get_template_part( 'form', 'user-login' ); 738 738 } else { … … 760 760 761 761 // Output templates 762 if ( ! is_user_logged_in() ) {762 if ( ! is_user_logged_in() ) { 763 763 bbp_get_template_part( 'form', 'user-register' ); 764 764 } else { … … 786 786 787 787 // Output templates 788 if ( ! is_user_logged_in() ) {788 if ( ! is_user_logged_in() ) { 789 789 bbp_get_template_part( 'form', 'user-lost-pass' ); 790 790 } else { -
trunk/src/includes/common/template.php
r6097 r6196 1473 1473 1474 1474 // Force array 1475 if ( ! empty( $r['exclude'] ) && ! is_array( $r['exclude'] ) ) {1475 if ( ! empty( $r['exclude'] ) && ! is_array( $r['exclude'] ) ) { 1476 1476 $r['exclude'] = explode( ',', $r['exclude'] ); 1477 1477 } -
trunk/src/includes/common/widgets.php
r6038 r6196 83 83 } 84 84 85 if ( ! is_user_logged_in() ) : ?>85 if ( ! is_user_logged_in() ) : ?> 86 86 87 87 <form method="post" action="<?php bbp_wp_login_action( array( 'context' => 'login_post' ) ); ?>" class="bbp-login-form"> … … 615 615 616 616 // Force to any 617 if ( ! empty( $instance['parent_forum'] ) && ! is_numeric( $instance['parent_forum'] ) ) {617 if ( ! empty( $instance['parent_forum'] ) && ! is_numeric( $instance['parent_forum'] ) ) { 618 618 $instance['parent_forum'] = 'any'; 619 619 } … … 860 860 861 861 // Force to any 862 if ( ! empty( $instance['parent_forum'] ) && ! is_numeric( $instance['parent_forum'] ) ) {862 if ( ! empty( $instance['parent_forum'] ) && ! is_numeric( $instance['parent_forum'] ) ) { 863 863 $instance['parent_forum'] = 'any'; 864 864 } -
trunk/src/includes/core/theme-compat.php
r5951 r6196 486 486 487 487 // Bail if shortcodes are unset somehow 488 if ( ! is_a( $bbp_shortcodes, 'BBP_Shortcodes' ) ) {488 if ( ! is_a( $bbp_shortcodes, 'BBP_Shortcodes' ) ) { 489 489 return $template; 490 490 } -
trunk/src/includes/extend/buddypress/functions.php
r6180 r6196 310 310 311 311 // Make sure result is an array 312 if ( ! is_array( $forum_ids ) ) {312 if ( ! is_array( $forum_ids ) ) { 313 313 $forum_ids = (array) $forum_ids; 314 314 } … … 342 342 343 343 // Make sure result is an array 344 if ( ! is_array( $group_ids ) ) {344 if ( ! is_array( $group_ids ) ) { 345 345 $group_ids = (array) $group_ids; 346 346 } -
trunk/src/includes/extend/buddypress/groups.php
r6115 r6196 304 304 <?php endif; ?> 305 305 306 <?php if ( ! is_admin() ) : ?>306 <?php if ( ! is_admin() ) : ?> 307 307 <input type="submit" value="<?php esc_attr_e( 'Save Settings', 'bbpress' ); ?>" /> 308 308 <?php endif; ?> … … 426 426 427 427 // Redirect after save when not in admin 428 if ( ! is_admin() ) {428 if ( ! is_admin() ) { 429 429 bp_core_redirect( trailingslashit( bp_get_group_permalink( buddypress()->groups->current_group ) . '/admin/' . $this->slug ) ); 430 430 } -
trunk/src/includes/extend/buddypress/loader.php
r5951 r6196 168 168 169 169 // Stop if there is no user displayed or logged in 170 if ( ! is_user_logged_in() && !bp_displayed_user_id() ) {170 if ( ! is_user_logged_in() && !bp_displayed_user_id() ) { 171 171 return; 172 172 } -
trunk/src/includes/forums/capabilities.php
r6087 r6196 138 138 139 139 // User is author so allow edit if not in admin 140 } elseif ( ! is_admin() && ( (int) $user_id === (int) $_post->post_author ) ) {140 } elseif ( ! is_admin() && ( (int) $user_id === (int) $_post->post_author ) ) { 141 141 $caps[] = $post_type->cap->edit_posts; 142 142 -
trunk/src/includes/forums/functions.php
r6141 r6196 276 276 /** No Errors *************************************************************/ 277 277 278 if ( ! empty( $forum_id ) && ! is_wp_error( $forum_id ) ) {278 if ( ! empty( $forum_id ) && ! is_wp_error( $forum_id ) ) { 279 279 280 280 /** Trash Check *******************************************************/ … … 549 549 /** No Errors *************************************************************/ 550 550 551 if ( ! empty( $forum_id ) && ! is_wp_error( $forum_id ) ) {551 if ( ! empty( $forum_id ) && ! is_wp_error( $forum_id ) ) { 552 552 553 553 // Update counts, etc... … … 2173 2173 2174 2174 // Bail if $posts_query is not an object or of incorrect class 2175 if ( ! is_object( $posts_query ) || !is_a( $posts_query, 'WP_Query' ) ) {2175 if ( ! is_object( $posts_query ) || ! is_a( $posts_query, 'WP_Query' ) ) { 2176 2176 return; 2177 2177 } … … 2358 2358 2359 2359 // Bail if not viewing a single item or if user has caps 2360 if ( ! is_singular() || bbp_is_user_keymaster() || current_user_can( 'read_hidden_forums' ) ) {2360 if ( ! is_singular() || bbp_is_user_keymaster() || current_user_can( 'read_hidden_forums' ) ) { 2361 2361 return; 2362 2362 } … … 2413 2413 2414 2414 // Bail if not viewing a single item or if user has caps 2415 if ( ! is_singular() || bbp_is_user_keymaster() || current_user_can( 'read_private_forums' ) ) {2415 if ( ! is_singular() || bbp_is_user_keymaster() || current_user_can( 'read_private_forums' ) ) { 2416 2416 return; 2417 2417 } -
trunk/src/includes/replies/functions.php
r6146 r6196 410 410 411 411 // Check for missing reply_id or error 412 if ( ! empty( $reply_id ) && ! is_wp_error( $reply_id ) ) {412 if ( ! empty( $reply_id ) && ! is_wp_error( $reply_id ) ) { 413 413 414 414 /** Topic Tags ********************************************************/ … … 772 772 /** No Errors *************************************************************/ 773 773 774 if ( ! empty( $reply_id ) && ! is_wp_error( $reply_id ) ) {774 if ( ! empty( $reply_id ) && ! is_wp_error( $reply_id ) ) { 775 775 776 776 // Update counts, etc... -
trunk/src/includes/replies/template.php
r6185 r6196 785 785 786 786 // Check reply and revision log exist 787 if ( empty( $reply_id ) || empty( $revision_log ) || ! is_array( $revision_log ) ) {787 if ( empty( $reply_id ) || empty( $revision_log ) || ! is_array( $revision_log ) ) { 788 788 return false; 789 789 } -
trunk/src/includes/users/functions.php
r6192 r6196 55 55 */ 56 56 function bbp_is_anonymous() { 57 if ( ! is_user_logged_in() && bbp_allow_anonymous() ) {57 if ( ! is_user_logged_in() && bbp_allow_anonymous() ) { 58 58 $is_anonymous = true; 59 59 } else {
Note: See TracChangeset
for help on using the changeset viewer.