Changeset 3473
- Timestamp:
- 11/21/2010 11:43:15 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
-
bp-core/bp-core-templatetags.php (modified) (2 diffs)
-
bp-forums.php (modified) (1 diff)
-
bp-forums/bp-forums-templatetags.php (modified) (2 diffs)
-
bp-groups.php (modified) (13 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-core/bp-core-templatetags.php
r3472 r3473 1782 1782 global $bp; 1783 1783 1784 if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'forum' == $bp->current_action && 'topic' == $bp->action_variables[0] )1784 if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'forum' == $bp->current_action && isset( $bp->action_variables[0] ) && 'topic' == $bp->action_variables[0] ) 1785 1785 return true; 1786 1786 … … 1791 1791 global $bp; 1792 1792 1793 if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'forum' == $bp->current_action && 'topic' == $bp->action_variables[0]&& 'edit' == $bp->action_variables[2] )1793 if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'forum' == $bp->current_action && isset( $bp->action_variables[0] ) && 'topic' == $bp->action_variables[0] && isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] ) 1794 1794 return true; 1795 1795 -
trunk/bp-forums.php
r3455 r3473 515 515 for ( $i = 0; $i < count( $posts ); $i++ ) { 516 516 foreach ( (array)$poster_names as $name ) { 517 if ( $name->user_id == $topics[$i]->user_id )517 if ( isset( $topics[$i] ) && $name->user_id == $topics[$i]->user_id ) 518 518 $posts[$i]->poster_name = $poster->value; 519 519 } -
trunk/bp-forums/bp-forums-templatetags.php
r3369 r3473 84 84 85 85 if ( !$no_stickies ) { 86 $stickies = array(); 87 $standard = array(); 88 86 89 // Place stickies at the top - not sure why bbPress doesn't do this? 87 90 foreach( (array)$this->topics as $topic ) { … … 188 191 189 192 /* If $_GET['fs'] is set, let's auto populate the search_terms var */ 190 if ( $bp->is_directory&& !empty( $_GET['fs'] ) )193 if ( isset( $bp->is_directory ) && !empty( $_GET['fs'] ) ) 191 194 $search_terms = $_GET['fs']; 192 195 -
trunk/bp-groups.php
r3472 r3473 288 288 289 289 /* Fetch the details we need */ 290 $topic_slug = $bp->action_variables[1];290 $topic_slug = isset( $bp->action_variables[1] ) ? $bp->action_variables[1] : false; 291 291 $topic_id = bp_forums_get_topic_id_from_slug( $topic_slug ); 292 292 $forum_id = groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' ); … … 295 295 296 296 /* Posting a reply */ 297 if ( ! $bp->action_variables[2]&& isset( $_POST['submit_reply'] ) ) {297 if ( !isset( $bp->action_variables[2] ) && isset( $_POST['submit_reply'] ) ) { 298 298 /* Check the nonce */ 299 299 check_admin_referer( 'bp_forums_new_reply' ); … … 303 303 groups_join_group( $bp->groups->current_group->id, $bp->loggedin_user->id ); 304 304 305 if ( !$post_id = groups_new_group_forum_post( $_POST['reply_text'], $topic_id, $_GET['topic_page'] ) ) 305 $topic_page = isset( $_GET['topic_page'] ) ? $_GET['topic_page'] : false; 306 307 if ( !$post_id = groups_new_group_forum_post( $_POST['reply_text'], $topic_id, $topic_page ) ) 306 308 bp_core_add_message( __( 'There was an error when replying to that topic', 'buddypress'), 'error' ); 307 309 else 308 310 bp_core_add_message( __( 'Your reply was posted successfully', 'buddypress') ); 309 311 310 if ( $_SERVER['QUERY_STRING'])312 if ( isset( $_SERVER['QUERY_STRING'] ) ) 311 313 $query_vars = '?' . $_SERVER['QUERY_STRING']; 312 314 … … 315 317 316 318 /* Sticky a topic */ 317 else if ( 'stick' == $bp->action_variables[2] && ( $bp->is_item_admin || $bp->is_item_mod) ) {319 else if ( isset( $bp->action_variables[2] ) && 'stick' == $bp->action_variables[2] && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) { 318 320 /* Check the nonce */ 319 321 check_admin_referer( 'bp_forums_stick_topic' ); … … 329 331 330 332 /* Un-Sticky a topic */ 331 else if ( 'unstick' == $bp->action_variables[2] && ( $bp->is_item_admin || $bp->is_item_mod) ) {333 else if ( isset( $bp->action_variables[2] ) && 'unstick' == $bp->action_variables[2] && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) { 332 334 /* Check the nonce */ 333 335 check_admin_referer( 'bp_forums_unstick_topic' ); … … 343 345 344 346 /* Close a topic */ 345 else if ( 'close' == $bp->action_variables[2] && ( $bp->is_item_admin || $bp->is_item_mod) ) {347 else if ( isset( $bp->action_variables[2] ) && 'close' == $bp->action_variables[2] && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) { 346 348 /* Check the nonce */ 347 349 check_admin_referer( 'bp_forums_close_topic' ); … … 357 359 358 360 /* Open a topic */ 359 else if ( 'open' == $bp->action_variables[2] && ( $bp->is_item_admin || $bp->is_item_mod) ) {361 else if ( isset( $bp->action_variables[2] ) && 'open' == $bp->action_variables[2] && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) { 360 362 /* Check the nonce */ 361 363 check_admin_referer( 'bp_forums_open_topic' ); … … 371 373 372 374 /* Delete a topic */ 373 else if ( 'delete' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) {375 else if ( isset( $bp->action_variables[2] ) && 'delete' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) { 374 376 /* Fetch the topic */ 375 377 $topic = bp_forums_get_topic_details( $topic_id ); … … 392 394 393 395 /* Editing a topic */ 394 else if ( 'edit' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) {396 else if ( isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) { 395 397 /* Fetch the topic */ 396 398 $topic = bp_forums_get_topic_details( $topic_id ); … … 417 419 418 420 /* Delete a post */ 419 else if ( 'delete' == $bp->action_variables[2]&& $post_id = $bp->action_variables[4] ) {421 else if ( isset( $bp->action_variables[2] ) && 'delete' == $bp->action_variables[2] && isset( $bp->action_variables[4] ) && $post_id = $bp->action_variables[4] ) { 420 422 /* Fetch the post */ 421 423 $post = bp_forums_get_post( $post_id ); … … 438 440 439 441 /* Editing a post */ 440 else if ( 'edit' == $bp->action_variables[2]&& $post_id = $bp->action_variables[4] ) {442 else if ( isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] && isset( $bp->action_variables[4] ) && $post_id = $bp->action_variables[4] ) { 441 443 /* Fetch the post */ 442 444 $post = bp_forums_get_post( $bp->action_variables[4] ); … … 486 488 $error_message = __( 'Forum posts cannot be empty. Please enter some text.', 'buddypress' ); 487 489 488 if ( $error_message) {490 if ( isset( $error_message ) ) { 489 491 bp_core_add_message( $error_message, 'error' ); 490 492 $redirect = bp_get_group_permalink( $bp->groups->current_group ) . 'forum'; … … 514 516 515 517 if ( $bp->is_single_item ) { 516 / * Refresh the group member count meta */518 // Refresh the group member count meta 517 519 groups_update_groupmeta( $bp->groups->current_group->id, 'total_member_count', groups_get_total_member_count( $bp->groups->current_group->id ) ); 518 520
Note: See TracChangeset
for help on using the changeset viewer.