From: <gi...@ma...> - 2010-02-26 23:30:41
|
The branch, master has been updated via db07af11b250152dcf63d115d207540544c1d89e (commit) via 6de2cea9081e76c3c56b6c8ea7b4d4cf5ff267b8 (commit) from 6a424345436880517c92601083a78ce9b1a9bbfc (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 db07af11b250152dcf63d115d207540544c1d89e Author: Kirill Krasnov <kra...@gm...> Date: Thu Feb 11 10:58:48 2010 +0200 Fix #11492: Incorrect use of BASE_PATH constant in jpgraph check Within admin/check.php the jpgraph check attempts to find the jpgraph libraries by using the BASE_PATH constant instead of config_get( 'absolute_path' ). Signed-off-by: David Hicks <hic...@op...> commit 6de2cea9081e76c3c56b6c8ea7b4d4cf5ff267b8 Author: Kirill Krasnov <kra...@gm...> Date: Thu Feb 11 10:10:03 2010 +0200 Fix #11294: System notice undefined offset in print_test_row (check.php) $p_info[$p_pass] is not always defined and therefore we need to check that array element exists before attempting to print it out to the user. Signed-off-by: David Hicks <hic...@op...> ----------------------------------------------------------------------- Summary of changes: admin/check.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------- commit db07af11b250152dcf63d115d207540544c1d89e Author: Kirill Krasnov <kra...@gm...> Date: Thu Feb 11 10:58:48 2010 +0200 Fix #11492: Incorrect use of BASE_PATH constant in jpgraph check Within admin/check.php the jpgraph check attempts to find the jpgraph libraries by using the BASE_PATH constant instead of config_get( 'absolute_path' ). Signed-off-by: David Hicks <hic...@op...> diff --git a/admin/check.php b/admin/check.php index d859216..71609f8 100644 --- a/admin/check.php +++ b/admin/check.php @@ -346,7 +346,7 @@ if( plugin_is_installed( 'MantisGraph' ) ) { print_test_row( 'checking gd is enabled, and version 2...', get_gd_version() == 2 ); if ( plugin_config_get( 'eczlibrary', OFF ) == OFF ) { - $t_jpgraph_path = BASE_PATH . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'jpgraph' . DIRECTORY_SEPARATOR; + $t_jpgraph_path = config_get( 'absolute_path' ) . 'library' . DIRECTORY_SEPARATOR . 'jpgraph' . DIRECTORY_SEPARATOR; if( !file_exists( $t_jpgraph_path . 'jpgraph.php') ) { print_test_row( 'checking we can find jpgraph class files...', false ); commit 6de2cea9081e76c3c56b6c8ea7b4d4cf5ff267b8 Author: Kirill Krasnov <kra...@gm...> Date: Thu Feb 11 10:10:03 2010 +0200 Fix #11294: System notice undefined offset in print_test_row (check.php) $p_info[$p_pass] is not always defined and therefore we need to check that array element exists before attempting to print it out to the user. Signed-off-by: David Hicks <hic...@op...> diff --git a/admin/check.php b/admin/check.php index ed5c155..d859216 100644 --- a/admin/check.php +++ b/admin/check.php @@ -73,7 +73,9 @@ function print_test_row( $p_description, $p_pass, $p_info = null ) { echo '<tr><td bgcolor="#ffffff">' .$p_description; if( $p_info != null) { if( is_array( $p_info ) ) { - echo '<br /><i>' . $p_info[$p_pass] . '</i>'; + if( isset( $p_info[$p_pass] ) ) { + echo '<br /><i>' . $p_info[$p_pass] . '</i>'; + } } else { echo '<br /><i>' . $p_info . '</i>'; } ----------------------------------------------------------------------- -- Mantis Bug Tracker |