Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mantisbt/mantisbt
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d38abf9556a3
Choose a base ref
...
head repository: mantisbt/mantisbt
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e61e63ca07d6
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 23, 2013

  1. Changed version to 1.2.14dev

    @dregad
    dregad committed Jan 23, 2013

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ced463b View commit details

  2. Fix huge memory consumption for print_user_option_list() 

    Following the implementation of the fix for 0010130, calling this
function when the current project is ALL_PROJECTS causes a massive surge
in memory usage as the code builds a large array containing the list of
all users in all projects accessible to the current user, and then
reduces it to remove duplicates.

This commit reduces the problem by removing calls to array_merge() and
building the consolidated user list in a single pass, using a while
loop. No-longer-used arrays are unset to free up memory.

Fixes #15411
    @dregad
    dregad committed Jan 23, 2013

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e61e63c View commit details
Showing with 14 additions and 9 deletions.
  1. +1 −1 core/constant_inc.php
  2. +13 −8 core/print_api.php
2 changes: 1 addition & 1 deletion core/constant_inc.php
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with MantisBT. If not, see <http://www.gnu.org/licenses/>.

define( 'MANTIS_VERSION', '1.2.13' );
define( 'MANTIS_VERSION', '1.2.14dev' );

# --- constants -------------------
# magic numbers
21 changes: 13 additions & 8 deletions core/print_api.php
View file
Original file line number Diff line number Diff line change
@@ -229,16 +229,20 @@ function print_user_option_list( $p_user_id, $p_project_id = null, $p_access = A
$t_projects = user_get_accessible_projects( $t_current_user );

# Get list of users having access level for all accessible projects
$t_users_temp = array();
$t_users = array();
foreach( $t_projects as $t_project_id ) {
$t_project_users_list = project_get_all_user_rows( $t_project_id, $p_access );
$t_users_temp = array_merge( $t_users_temp, $t_project_users_list );
}

# Build list of users as an associative array (to remove duplicates)
foreach( $t_users_temp as $t_user ) {
$t_users[$t_user['id']] = $t_user;
# Do a 'smart' merge of the project's user list, into an
# associative array (to remove duplicates)
# Use a while loop for better performance
$i = 0;
while( isset( $t_project_users_list[$i] ) ) {
$t_users[ $t_project_users_list[$i]['id'] ] = $t_project_users_list[$i];
$i++;
}
unset( $t_project_users_list );
}
unset( $t_projects );
} else {
$t_users = project_get_all_user_rows( $p_project_id, $p_access );
}
@@ -263,7 +267,8 @@ function print_user_option_list( $p_user_id, $p_project_id = null, $p_access = A
$t_sort[] = $t_sort_name;
}
array_multisort( $t_sort, SORT_ASC, SORT_STRING, $t_users, $t_display );
$t_count = count( $t_sort );
unset( $t_sort );
$t_count = count( $t_users );
for( $i = 0;$i < $t_count;$i++ ) {
$t_row = $t_users[$i];
echo '<option value="' . $t_row['id'] . '" ';