Permalink
Browse files

Remove "$g_" prefix from obsolete config warning messages

Designating config options using the "$g_" prefix in the warning
messages when checking for obsolete configurations does not make sense
when they are defined in the database.

Removing this previx also makes the messages consistent with the new
admin checks interface in 1.3.

Affects issue #13435
  • Loading branch information...
1 parent 5e9b834 commit 991e54be78c7ff757570fef10a489baf27933aa8 @dregad dregad committed Nov 19, 2011
Showing with 3 additions and 3 deletions.
  1. +3 −3 core/config_api.php
View
@@ -529,7 +529,7 @@ function config_obsolete( $p_var, $p_replace = '' ) {
# new config option names in the warning text)
if( config_is_set( $p_var ) ) {
- $t_description = '<p><b>Warning:</b> The configuration option <tt>$g_' . $p_var . '</tt> is now obsolete</p>';
+ $t_description = '<p><b>Warning:</b> The configuration option <tt>' . $p_var . '</tt> is now obsolete</p>';
$t_info = '';
// Check if set in the database
@@ -556,12 +556,12 @@ function config_obsolete( $p_var, $p_replace = '' ) {
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 <tt>' . $p_replace . '</tt> instead.';
}
print_test_warn_row( $t_description, false, $t_info );

0 comments on commit 991e54b

Please sign in to comment.