From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Mon, 27 Sep 2010 09:43:01 +0000 (+0000)
Subject: Allowed optional path usage in set_icon  parameter
X-Git-Tag: v2.4.2~19^2~612
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=4567e45243466f391f152b86cd972a847ec82a86;p=fa-stable.git

Allowed optional path usage in set_icon  parameter
---

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 272d515b..1e297704 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -257,7 +257,9 @@ function submit_js_confirm($name, $msg) {
 function set_icon($icon, $title=false)
 {
 	global $path_to_root;
-	return "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='12' height='12' border='0'".($title ? " title='$title'" : "")." />\n";	
+	if (basename($icon) === $icon) // standard icons does not contain path separator
+		$icon = "$path_to_root/themes/".user_theme()."/images/$icon";
+	return "<img src='$icon' width='12' height='12' border='0'".($title ? " title='$title'" : "")." />\n";	
 }
 
 function button($name, $value, $title=false, $icon=false,  $aspect='')