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: 46873eb
Choose a base ref
...
head repository: mantisbt/mantisbt
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d1cd06c
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 19, 2011

  1. Fix PHP admin check for error logging/reporting 

    The check for "PHP errors are being logged or reported" in the new
admin check interface has incorrect logic, causing it to always report
a warning condition.

The warning should only be printed if both display_errors and
log_errors are Off.

Fixes #13545, #11576
    @dregad
    dregad committed Nov 19, 2011

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    schneefux
    GPG key ID: 50F2BF336737C2F0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    88ca322 View commit details

  2. Reimplement obsolete config checks in admin/check interface 

    The rewritten check.php scripts (as a collection of checks in the
admin/check/ directory), implemented per issue #11576 in commit
ba97560, neglected to port across
obsolete configuration checking from 1.2.x.

Fixes #12885
    @dregad
    dregad committed Nov 19, 2011

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d1cd06c View commit details
Showing with 8 additions and 6 deletions.
  1. +3 −1 admin/check/check_config_inc.php
  2. +1 −1 admin/check/check_php_inc.php
  3. +4 −4 core/config_api.php
4 changes: 3 additions & 1 deletion admin/check/check_config_inc.php
View file
Original file line number Diff line number Diff line change
@@ -47,4 +47,6 @@
check_print_test_warn_row( 'Check whether log output is sent to end user',
!($g_log_destination == 'firebug' || $g_log_destination == 'page'),
array( false => 'Diagnostic output destination is currently sent to end users browser' )
);
);

require_api( 'obsolete.php' );
2 changes: 1 addition & 1 deletion admin/check/check_php_inc.php
View file
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@

check_print_test_warn_row(
'PHP errors are being logged or reported',
!( ini_get_bool( 'display_errors' ) || ini_get_bool( 'log_errors' ) ),
ini_get_bool( 'display_errors' ) || ini_get_bool( 'log_errors' ),
array( false => 'PHP is not currently set to log or report errors and thus you may be unaware of PHP errors that occur.' )
);

8 changes: 4 additions & 4 deletions core/config_api.php
View file
Original file line number Diff line number Diff line change
@@ -539,21 +539,21 @@ function config_obsolete( $p_var, $p_replace = '' ) {
# new config option names in the warning text)

if( config_is_set( $p_var ) ) {
$t_description = '<p><strong>Warning:</strong> The configuration option <tt>$g_' . $p_var . '</tt> is now obsolete</p>';
$t_description = 'The configuration option <em>' . $p_var . '</em> is now obsolete';
if( is_array( $p_replace ) ) {
$t_info = 'please see the following options: <ul>';
foreach( $p_replace as $t_option ) {
$t_info .= '<li>$g_' . $t_option . '</li>';
$t_info .= '<li>' . $t_option . '</li>';
}
$t_info .= '</ul>';
}
else if( !is_blank( $p_replace ) ) {
$t_info = 'please use <tt>$g_' . $p_replace . '</tt> instead.';
$t_info = 'please use ' . $p_replace . ' instead.';
} else {
$t_info = '';
}

print_test_warn_row( $t_description, false, $t_info );
check_print_test_warn_row( $t_description, false, $t_info );
}
}