From: <gi...@ma...> - 2010-10-18 11:09:24
|
The branch, master-1.2.x has been updated via ed4de9ae2645aa7d01ca310b8e0e3f67f90bbc72 (commit) from a75865f2c36b3a7d828f0270580c48b4dd81dddf (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 ed4de9ae2645aa7d01ca310b8e0e3f67f90bbc72 Author: David Hicks <hic...@op...> Date: Sat Sep 18 13:35:09 2010 +1000 Fix #10995: Unable to read or find fonts when using JpGraph The logic inside the graph_get_font() function of MantisGraph/core/graph_api.php was completely broken when using JpGraph. Thanks to Kirill Krasnov for the initial patch. ----------------------------------------------------------------------- Summary of changes: plugins/MantisGraph/core/graph_api.php | 20 +++----------------- 1 files changed, 3 insertions(+), 17 deletions(-) ----------------------------------------------------------------------- commit ed4de9ae2645aa7d01ca310b8e0e3f67f90bbc72 Author: David Hicks <hic...@op...> Date: Sat Sep 18 13:35:09 2010 +1000 Fix #10995: Unable to read or find fonts when using JpGraph The logic inside the graph_get_font() function of MantisGraph/core/graph_api.php was completely broken when using JpGraph. Thanks to Kirill Krasnov for the initial patch. diff --git a/plugins/MantisGraph/core/graph_api.php b/plugins/MantisGraph/core/graph_api.php index c7ea955..0c50f30 100644 --- a/plugins/MantisGraph/core/graph_api.php +++ b/plugins/MantisGraph/core/graph_api.php @@ -51,12 +51,9 @@ if( OFF == plugin_config_get( 'eczlibrary' ) ) { } function graph_get_font() { - $t_font = plugin_config_get( 'font', '' ); + $t_font = plugin_config_get( 'font', 'arial' ); if ( plugin_config_get( 'eczlibrary' ) == ON ) { - $ttf_dir = ''; - $t_font = ''; - $t_font_map = array( 'arial' => 'arial.ttf', 'verdana' => 'verdana.ttf', @@ -70,21 +67,10 @@ function graph_get_font() { ); if( isset( $t_font_map[$t_font] ) ) { - $t_font = $t_font_map[$t_font]; + return $t_font_map[$t_font]; } else { - $t_font = 'arial.ttf'; - } - - - $t_font_path = get_font_path(); - if( empty($t_font_path) ) { - error_text('unable to load font(s)', 'unable to load font(s)'); - } - $f = $t_font_path . $t_font; - if( file_exists($f) === false || is_readable($f) === false ) { - error_text('unable to read/find font', 'unable to read/find font'); + return 'arial.ttf'; } - return $f; } else { $t_font_map = array( 'arial' => FF_ARIAL, ----------------------------------------------------------------------- -- Mantis Bug Tracker |