Changeset 7372
- Timestamp:
- 11/18/2025 12:55:54 AM (4 months ago)
- Location:
- trunk/src/includes
- Files:
-
- 19 edited
-
admin/classes/class-bbp-topic-replies-list-table.php (modified) (1 diff)
-
admin/converters/Drupal7.php (modified) (1 diff)
-
admin/converters/Example.php (modified) (1 diff)
-
admin/converters/FluxBB.php (modified) (1 diff)
-
admin/converters/Kunena1.php (modified) (1 diff)
-
admin/converters/Kunena3.php (modified) (1 diff)
-
admin/converters/PHPWind.php (modified) (2 diffs)
-
admin/converters/Phorum.php (modified) (1 diff)
-
admin/converters/XMB.php (modified) (1 diff)
-
admin/converters/XenForo.php (modified) (2 diffs)
-
admin/converters/vBulletin.php (modified) (2 diffs)
-
admin/converters/vBulletin3.php (modified) (2 diffs)
-
admin/forums.php (modified) (4 diffs)
-
admin/replies.php (modified) (4 diffs)
-
admin/topics.php (modified) (4 diffs)
-
common/locks.php (modified) (1 diff)
-
core/capabilities.php (modified) (1 diff)
-
extend/buddypress/groups.php (modified) (1 diff)
-
users/engagements.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/includes/admin/classes/class-bbp-topic-replies-list-table.php
r7171 r7372 43 43 44 44 // Construct the list table 45 parent::__construct( $args ); } 45 parent::__construct( $args ); 46 } 46 47 47 48 /** -
trunk/src/includes/admin/converters/Drupal7.php
r7352 r7372 501 501 'to_type' => 'user', 502 502 'to_fieldname' => '_bbp_password' 503 //'callback_method' => 'callback_savepass'503 // 'callback_method' => 'callback_savepass' 504 504 ); 505 505 -
trunk/src/includes/admin/converters/Example.php
r7352 r7372 162 162 'join_type' => 'INNER', 163 163 'join_expression' => 'USING groups_table.forum_id = forums_table.forum_id', 164 //'from_expression' => 'WHERE forums_table.forum_id != 1',164 // 'from_expression' => 'WHERE forums_table.forum_id != 1', 165 165 'to_type' => 'forum' 166 166 ); -
trunk/src/includes/admin/converters/FluxBB.php
r7352 r7372 455 455 456 456 // Store old user salt (This is only used for the SELECT row info for the above password save) 457 // $this->field_map[] = array( 458 // 'from_tablename' => 'users', 459 // 'from_fieldname' => 'salt', 460 // 'to_type' => 'user', 461 // 'to_fieldname' => '' 462 // ); 457 /* 458 $this->field_map[] = array( 459 'from_tablename' => 'users', 460 'from_fieldname' => 'salt', 461 'to_type' => 'user', 462 'to_fieldname' => '' 463 ); 464 */ 463 465 464 466 // User password verify class (Stored in usermeta for verifying password) -
trunk/src/includes/admin/converters/Kunena1.php
r7360 r7372 400 400 401 401 // Store old user salt (This is only used for the SELECT row info for the above password save) 402 // $this->field_map[] = array( 403 // 'from_tablename' => 'user', 404 // 'from_fieldname' => 'salt', 405 // 'to_type' => 'user', 406 // 'to_fieldname' => '' 407 // ); 402 /* 403 $this->field_map[] = array( 404 'from_tablename' => 'user', 405 'from_fieldname' => 'salt', 406 'to_type' => 'user', 407 'to_fieldname' => '' 408 ); 408 409 409 410 // User password verify class (Stored in usermeta for verifying password) 410 // $this->field_map[] = array( 411 // 'to_type' => 'user', 412 // 'to_fieldname' => '_bbp_class', 413 // 'default' => 'Kunena1' 414 // ); 411 $this->field_map[] = array( 412 'to_type' => 'user', 413 'to_fieldname' => '_bbp_class', 414 'default' => 'Kunena1' 415 ); 416 */ 415 417 416 418 // User name. -
trunk/src/includes/admin/converters/Kunena3.php
r7352 r7372 418 418 419 419 // Store old user salt (This is only used for the SELECT row info for the above password save) 420 // $this->field_map[] = array( 421 // 'from_tablename' => 'users', 422 // 'from_fieldname' => 'salt', 423 // 'to_type' => 'user', 424 // 'to_fieldname' => '' 425 // ); 420 /* 421 $this->field_map[] = array( 422 'from_tablename' => 'users', 423 'from_fieldname' => 'salt', 424 'to_type' => 'user', 425 'to_fieldname' => '' 426 ); 427 */ 426 428 427 429 // User password verify class (Stored in usermeta for verifying password) -
trunk/src/includes/admin/converters/PHPWind.php
r7352 r7372 421 421 'to_type' => 'user', 422 422 'to_fieldname' => '_bbp_password' 423 //'callback_method' => 'callback_savepass'423 // 'callback_method' => 'callback_savepass' 424 424 ); 425 425 426 426 // Store old user salt (This is only used for the SELECT row info for the above password save) 427 /* $this->field_map[] = array( 427 /* 428 $this->field_map[] = array( 428 429 'from_tablename' => 'user', 429 430 'from_fieldname' => 'pass', … … 431 432 'to_fieldname' => '' 432 433 ); 433 */ 434 */ 435 434 436 // User password verify class (Stored in usermeta for verifying password) 435 437 $this->field_map[] = array( -
trunk/src/includes/admin/converters/Phorum.php
r7352 r7372 445 445 446 446 // Store old user salt (This is only used for the SELECT row info for the above password save) 447 // $this->field_map[] = array( 448 // 'from_tablename' => 'users', 449 // 'from_fieldname' => 'salt', 450 // 'to_type' => 'user', 451 // 'to_fieldname' => '' 452 // ); 447 /* 448 $this->field_map[] = array( 449 'from_tablename' => 'users', 450 'from_fieldname' => 'salt', 451 'to_type' => 'user', 452 'to_fieldname' => '' 453 ); 454 */ 453 455 454 456 // User password verify class (Stored in usermeta for verifying password) -
trunk/src/includes/admin/converters/XMB.php
r7352 r7372 487 487 488 488 // Store old User Salt (This is only used for the SELECT row info for the above password save) 489 // $this->field_map[] = array( 490 // 'from_tablename' => 'members', 491 // 'from_fieldname' => 'salt', 492 // 'to_type' => 'user', 493 // 'to_fieldname' => '' 494 // ); 489 /* 490 $this->field_map[] = array( 491 'from_tablename' => 'members', 492 'from_fieldname' => 'salt', 493 'to_type' => 'user', 494 'to_fieldname' => '' 495 ); 496 */ 495 497 496 498 // User password verify class (Stored in usermeta for verifying password) -
trunk/src/includes/admin/converters/XenForo.php
r7352 r7372 522 522 ); 523 523 524 /* // User password. 524 /* 525 // User password. 525 526 // Note: We join the 'user_authenticate' table because 'user' does not include password. 526 527 $this->field_map[] = array( … … 550 551 'to_fieldname' => '' 551 552 ); 552 */ 553 */ 554 553 555 // User password verify class (Stored in usermeta for verifying password) 554 556 $this->field_map[] = array( -
trunk/src/includes/admin/converters/vBulletin.php
r7352 r7372 142 142 'default' => date( 'Y-m-d H:i:s' ) 143 143 ); 144 $this->field_map[] 144 $this->field_map[] = array( 145 145 'to_type' => 'forum', 146 146 'to_fieldname' => 'post_date_gmt', 147 147 'default' => date( 'Y-m-d H:i:s' ) 148 148 ); 149 $this->field_map[] 149 $this->field_map[] = array( 150 150 'to_type' => 'forum', 151 151 'to_fieldname' => 'post_modified', 152 152 'default' => date( 'Y-m-d H:i:s' ) 153 153 ); 154 $this->field_map[] 154 $this->field_map[] = array( 155 155 'to_type' => 'forum', 156 156 'to_fieldname' => 'post_modified_gmt', … … 510 510 'callback_method' => 'callback_datetime' 511 511 ); 512 $this->field_map[] 512 $this->field_map[] = array( 513 513 'from_tablename' => 'post', 514 514 'from_fieldname' => 'dateline', -
trunk/src/includes/admin/converters/vBulletin3.php
r7352 r7372 142 142 'default' => date( 'Y-m-d H:i:s' ) 143 143 ); 144 $this->field_map[] 144 $this->field_map[] = array( 145 145 'to_type' => 'forum', 146 146 'to_fieldname' => 'post_date_gmt', 147 147 'default' => date( 'Y-m-d H:i:s' ) 148 148 ); 149 $this->field_map[] 149 $this->field_map[] = array( 150 150 'to_type' => 'forum', 151 151 'to_fieldname' => 'post_modified', 152 152 'default' => date( 'Y-m-d H:i:s' ) 153 153 ); 154 $this->field_map[] 154 $this->field_map[] = array( 155 155 'to_type' => 'forum', 156 156 'to_fieldname' => 'post_modified_gmt', … … 510 510 'callback_method' => 'callback_datetime' 511 511 ); 512 $this->field_map[] 512 $this->field_map[] = array( 513 513 'from_tablename' => 'post', 514 514 'from_fieldname' => 'dateline', -
trunk/src/includes/admin/forums.php
r7361 r7372 98 98 // Overview 99 99 get_current_screen()->add_help_tab( array( 100 'id' 101 'title' 102 'content' 100 'id' => 'overview', 101 'title' => __( 'Overview', 'bbpress' ), 102 'content' => 103 103 '<p>' . __( 'This screen displays the individual forums on your site. You can customize the display of this screen to suit your workflow.', 'bbpress' ) . '</p>' 104 104 ) ); … … 106 106 // Screen Content 107 107 get_current_screen()->add_help_tab( array( 108 'id' 109 'title' 110 'content' 108 'id' => 'screen-content', 109 'title' => __( 'Screen Content', 'bbpress' ), 110 'content' => 111 111 '<p>' . __( 'You can customize the display of this screen’s contents in a number of ways:', 'bbpress' ) . '</p>' . 112 112 '<ul>' . … … 119 119 // Available Actions 120 120 get_current_screen()->add_help_tab( array( 121 'id' 122 'title' 123 'content' 121 'id' => 'action-links', 122 'title' => __( 'Available Actions', 'bbpress' ), 123 'content' => 124 124 '<p>' . __( 'Hovering over a row in the forums list will display action links that allow you to manage your forum. You can perform the following actions:', 'bbpress' ) . '</p>' . 125 125 '<ul>' . … … 133 133 // Bulk Actions 134 134 get_current_screen()->add_help_tab( array( 135 'id' 136 'title' 137 'content' 135 'id' => 'bulk-actions', 136 'title' => __( 'Bulk Actions', 'bbpress' ), 137 'content' => 138 138 '<p>' . __( 'You can also edit or move multiple forums to the trash at once. Select the forums you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.', 'bbpress' ) . '</p>' . 139 139 '<p>' . __( 'When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected forums at once. To remove a forum from the grouping, just click the x next to its name in the Bulk Edit area that appears.', 'bbpress' ) . '</p>' -
trunk/src/includes/admin/replies.php
r7361 r7372 112 112 // Overview 113 113 get_current_screen()->add_help_tab( array( 114 'id' 115 'title' 116 'content' 114 'id' => 'overview', 115 'title' => __( 'Overview', 'bbpress' ), 116 'content' => 117 117 '<p>' . __( 'This screen provides access to all of your replies. You can customize the display of this screen to suit your workflow.', 'bbpress' ) . '</p>' 118 118 ) ); … … 120 120 // Screen Content 121 121 get_current_screen()->add_help_tab( array( 122 'id' 123 'title' 124 'content' 122 'id' => 'screen-content', 123 'title' => __( 'Screen Content', 'bbpress' ), 124 'content' => 125 125 '<p>' . __( 'You can customize the display of this screen’s contents in a number of ways:', 'bbpress' ) . '</p>' . 126 126 '<ul>' . … … 134 134 // Available Actions 135 135 get_current_screen()->add_help_tab( array( 136 'id' 137 'title' 138 'content' 136 'id' => 'action-links', 137 'title' => __( 'Available Actions', 'bbpress' ), 138 'content' => 139 139 '<p>' . __( 'Hovering over a row in the replies list will display action links that allow you to manage your reply. You can perform the following actions:', 'bbpress' ) . '</p>' . 140 140 '<ul>' . … … 150 150 // Bulk Actions 151 151 get_current_screen()->add_help_tab( array( 152 'id' 153 'title' 154 'content' 152 'id' => 'bulk-actions', 153 'title' => __( 'Bulk Actions', 'bbpress' ), 154 'content' => 155 155 '<p>' . __( 'You can also edit, spam, or move multiple replies to the trash at once. Select the replies you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.', 'bbpress' ) . '</p>' . 156 156 '<p>' . __( 'When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected replies at once. To remove a reply from the grouping, just click the x next to its name in the Bulk Edit area that appears.', 'bbpress' ) . '</p>' -
trunk/src/includes/admin/topics.php
r7360 r7372 116 116 // Overview 117 117 get_current_screen()->add_help_tab( array( 118 'id' 119 'title' 120 'content' 118 'id' => 'overview', 119 'title' => __( 'Overview', 'bbpress' ), 120 'content' => 121 121 '<p>' . __( 'This screen displays the individual topics on your site. You can customize the display of this screen to suit your workflow.', 'bbpress' ) . '</p>' 122 122 ) ); … … 124 124 // Screen Content 125 125 get_current_screen()->add_help_tab( array( 126 'id' 127 'title' 128 'content' 126 'id' => 'screen-content', 127 'title' => __( 'Screen Content', 'bbpress' ), 128 'content' => 129 129 '<p>' . __( 'You can customize the display of this screen’s contents in a number of ways:', 'bbpress' ) . '</p>' . 130 130 '<ul>' . … … 138 138 // Available Actions 139 139 get_current_screen()->add_help_tab( array( 140 'id' 141 'title' 142 'content' 140 'id' => 'action-links', 141 'title' => __( 'Available Actions', 'bbpress' ), 142 'content' => 143 143 '<p>' . __( 'Hovering over a row in the topics list will display action links that allow you to manage your topic. You can perform the following actions:', 'bbpress' ) . '</p>' . 144 144 '<ul>' . … … 156 156 // Bulk Actions 157 157 get_current_screen()->add_help_tab( array( 158 'id' 159 'title' 160 'content' 158 'id' => 'bulk-actions', 159 'title' => __( 'Bulk Actions', 'bbpress' ), 160 'content' => 161 161 '<p>' . __( 'You can also edit, spam, or move multiple topics to the trash at once. Select the topics you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.', 'bbpress' ) . '</p>' . 162 162 '<p>' . __( 'When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected topics at once. To remove a topic from the grouping, just click the x next to its name in the Bulk Edit area that appears.', 'bbpress' ) . '</p>' -
trunk/src/includes/common/locks.php
r7357 r7372 58 58 * @param int $post_id ID of the post to being edited 59 59 * @return bool|array Returns false if the post doesn't exist of there is no current user, or 60 * 60 * an array of the lock time and the user ID. 61 61 */ 62 62 function bbp_set_post_lock( $post_id = 0 ) { -
trunk/src/includes/core/capabilities.php
r7268 r7372 517 517 * This is currently only used when updating, uninstalling, or resetting bbPress. 518 518 * 519 * @see 519 * @see bbp_admin_reset_handler() 520 520 * @see bbp_do_uninstall() 521 521 * @see bbp_version_updater() -
trunk/src/includes/extend/buddypress/groups.php
r7361 r7372 1804 1804 1805 1805 // Use the first group ID 1806 $group_id 1807 $group 1806 $group_id = $group_ids[0]; 1807 $group = groups_get_group( array( 'group_id' => $group_id ) ); 1808 1808 $group_link = trailingslashit( $this->group_url( $group ) ); 1809 1809 $redirect_to = trailingslashit( $group_link . $this->slug ); -
trunk/src/includes/users/engagements.php
r7357 r7372 957 957 'post_type' => $r['object_type'], 958 958 'posts_per_page' => -1, 959 'meta_query' => array( 959 'meta_query' => array( 960 960 array( 961 961 'key' => $r['rel_key'], … … 970 970 'ignore_sticky_posts' => true, 971 971 'no_found_rows' => true 972 ) 972 ) 973 973 ); 974 974 }
Note: See TracChangeset
for help on using the changeset viewer.