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

2013-11-13 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_html.php: fixed the checks for duplicate images
	in the function "html_print_image" into the metaconsole
	installations.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9072 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-11-13 14:36:18 +00:00
parent d71a39c470
commit 24ea62af17
2 changed files with 20 additions and 6 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 @@
2013-11-13 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_html.php: fixed the checks for duplicate images
in the function "html_print_image" into the metaconsole
installations.
2013-11-13 Miguel de Dios <miguel.dedios@artica.es>
* operation/visual_console/render_view.php,

20
pandora_console/include/functions_html.php
View File

@ -1639,22 +1639,30 @@ function html_print_image ($src, $return = false, $options = false, $return_src
}
if (!$relative) {
$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 (!$relative) {
if (false === @file_get_contents($src, 0, null, 0, 1)) {
$src = ui_get_full_url('../../' . $src_tmp);
if (!is_readable("enterprise/meta/" . $src)) {
$src = ui_get_full_url('../../' . $src);
html_debug_print($src, true);
}
else {
html_debug_print("###### " . $src, true);
}
}
else {
$src = '../../' . $src;
}
}
else {
if (!$relative) {
$src_tmp = $src;
$src = ui_get_full_url($src);
}
}
// Only return src field of image
if ($return_src) {