From e7fd93db2be85398f84f472e7635495e6284219f Mon Sep 17 00:00:00 2001
From: David Hicks <hickseydr@optusnet.com.au>
Date: Sat, 18 Sep 2010 13:35:09 +1000
Subject: [PATCH] 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.
---
 plugins/MantisGraph/core/graph_api.php |   20 +++-----------------
 1 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/plugins/MantisGraph/core/graph_api.php b/plugins/MantisGraph/core/graph_api.php
index 7a1a196b..1749c17 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,
-- 
1.7.2.3