Fixes: 11098: Zend check is not correct IMHO. - also fixes other chec…

…k.php errors.
mantisbt · Oct 30, 2009 · f7004c2 · f7004c2
1 parent d880d59
commit f7004c2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git 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 @@ function test_database_utf8() {
 	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 @@ function test_database_utf8() {
 		}
 
 		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
@@ -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 );
 	}
 }