tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-10-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_html.php: Fixed print_image when source image 
	doesn't exists on metaconsole then try to search it in normal 
	console.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7045 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-10-04 16:21:27 +00:00
parent a17b8530ca
commit adca78f659
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-10-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_html.php: Fixed print_image when source image
doesn't exists on metaconsole then try to search it in normal
console.
2012-10-04 Ramon Novoa <rnovoa@artica.es>
* include/functions_api.php: Fixed a typo.

8
pandora_console/include/functions_html.php
View File

@ -1267,8 +1267,16 @@ function html_print_image ($src, $return = false, $options = false, $return_src
}
$src_tmp = $src;
$src = ui_get_full_url($src);
// If metaconsole is activated and image doesn't exists try to search on normal console
if (defined('METACONSOLE')) {
if (false === file_get_contents($src,0,null,0,1)) {
$src = ui_get_full_url('../../' . $src_tmp);
}
}
// Only return src field of image
if ($return_src) {
if (!$return) {