From: <gi...@ma...> - 2009-10-30 06:50:06
|
The branch, master-1.2.x has been updated via f7004c2635fe1a7922084086082904fba2d333e1 (commit) from d880d59a518305c4b4196ece5d7f6188af0206cb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f7004c2635fe1a7922084086082904fba2d333e1 Author: Victor Boctor <vb...@gm...> Date: Thu Oct 29 23:49:31 2009 -0700 Fixes: 11098: Zend check is not correct IMHO. - also fixes other check.php errors. ----------------------------------------------------------------------- Summary of changes: admin/check.php | 9 ++++++--- core/config_api.php | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) ----------------------------------------------------------------------- commit f7004c2635fe1a7922084086082904fba2d333e1 Author: Victor Boctor <vb...@gm...> Date: Thu Oct 29 23:49:31 2009 -0700 Fixes: 11098: Zend check is not correct IMHO. - also fixes other check.php errors. diff --git a/admin/check.php b/admin/check.php index f139a87..14a1ccb 100644 --- a/admin/check.php +++ b/admin/check.php @@ -169,6 +169,8 @@ function check_zend_optimiser_version() { define ( 'ZEND_OPTIMIZER_VERSION', '3.3'); define ( 'ZEND_OPTIMIZER_SUBVERSION', 3); + $t_info = ''; + if (strstr($t_output, "Zend Optimizer")) { $t_version = explode( 'Zend Optimizer', $t_output ); $t_version = explode( ',', $t_version[1] ); @@ -184,7 +186,8 @@ function check_zend_optimiser_version() { $t_dummy = array_pop($t_version); $t_version = implode(".",$t_version); - if (!($t_version > ZEND_OPTIMIZER_VERSION) || ($t_version==ZEND_OPTIMIZER_VERSION && $t_subVersion>=ZEND_OPTIMIZER_SUBVERSION)) { + if ( ( $t_version < ZEND_OPTIMIZER_VERSION ) || + ( $t_version == ZEND_OPTIMIZER_VERSION && $t_subVersion < ZEND_OPTIMIZER_SUBVERSION ) ) { $t_pass = false; $t_info = 'Fail - Installed Version: ' . $t_version . '.' . $t_subVersion . '.'; } @@ -335,7 +338,7 @@ if( plugin_is_installed( 'MantisGraph' ) ) { plugin_push_current( 'MantisGraph' ); print_test_row( 'checking gd is enabled, and version 2...', get_gd_version() == 2 ); - if ( plugin_config_get( 'eczlibrary' ) == OFF ) { + if ( plugin_config_get( 'eczlibrary', OFF ) == OFF ) { $t_jpgraph_path = BASE_PATH . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'jpgraph' . DIRECTORY_SEPARATOR; if( !file_exists( $t_jpgraph_path . 'jpgraph.php') ) { @@ -346,7 +349,7 @@ if( plugin_is_installed( 'MantisGraph' ) ) { } print_test_row( 'check configuration: jpgraph (if used) requires php bundled gd for antialiasing support', - ( plugin_config_get( 'jpgraph_antialias' ) == OFF || function_exists('imageantialias') ) ); + ( plugin_config_get( 'jpgraph_antialias', OFF ) == OFF || function_exists('imageantialias') ) ); } plugin_pop_current(); } diff --git a/core/config_api.php b/core/config_api.php index e5c435a..d0b0e6f 100644 --- a/core/config_api.php +++ b/core/config_api.php @@ -535,8 +535,11 @@ function config_obsolete( $p_var, $p_replace ) { $t_info .= '</ul>'; } else if( !is_blank( $p_replace ) ) { - $t_info .= 'please use <tt>$g_' . $p_replace . '</tt> instead.'; + $t_info = 'please use <tt>$g_' . $p_replace . '</tt> instead.'; + } else { + $t_info = ''; } + print_test_warn_row( $t_description, $t_info, false ); } } ----------------------------------------------------------------------- -- Mantis Bug Tracker |