Skip to content

Commit

Permalink
Fix merge of PR 861 into master
Browse files Browse the repository at this point in the history
Fix the merge of pull request #861 after merge:
Merge remote-tracking branch 'origin/master-1.3.x'
ee8277b
  • Loading branch information
cproensa authored and vboctor committed Nov 25, 2016
1 parent ee8277b commit 718093e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions core/layout_api.php
Expand Up @@ -551,7 +551,7 @@ function layout_navbar_button_bar() {
return;
}

$t_can_report_bug = access_has_any_project_level( config_get( 'report_bug_threshold' ) );
$t_can_report_bug = access_has_any_project_level( 'report_bug_threshold' );
$t_can_invite_user = current_user_is_administrator();

if( !$t_can_report_bug && !$t_can_invite_user ) {
Expand Down Expand Up @@ -721,7 +721,7 @@ function layout_print_sidebar( $p_active_sidebar_page = null ) {
layout_sidebar_menu( 'view_all_bug_page.php', 'view_bugs_link', 'fa-list-alt', $p_active_sidebar_page );

# Report Bugs
if( access_has_project_level( config_get( 'report_bug_threshold' ) ) ) {
if( access_has_any_project_level( 'report_bug_threshold' ) ) {
$t_bug_url = string_get_bug_report_url();
layout_sidebar_menu( $t_bug_url, 'report_bug_link', 'fa-edit', $p_active_sidebar_page );
}
Expand Down

0 comments on commit 718093e

Please sign in to comment.