diff --git a/main/document/document.inc.php b/main/document/document.inc.php index 2f13ccacbe..efcec0227f 100755 --- a/main/document/document.inc.php +++ b/main/document/document.inc.php @@ -573,18 +573,4 @@ function search_keyword($document_name, $keyword) { } } -/** - * Check brosers support for svg files - * @return return bool Return true - */ -function support_svg() { - $browser_info = get_browser($_SERVER["HTTP_USER_AGENT"], true); - //print_r($browser_info); - if (($browser_info[browser]=='IE' && $browser_info[majorver]>8) || ($browser_info[browser]=='Firefox' && $browser_info[majorver]>1)||($browser_info[browser]=='Safari' && $browser_info[majorver]>3) || $browser_info[browser]=='Chrome' || ($browser_info[browser]=='Opera' && $browser_info[majorver]>9)){ - return true; - }else{ - return false; - } -} - ?> \ No newline at end of file diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php index c771ca169a..1e17302d7b 100755 --- a/main/inc/lib/main_api.lib.php +++ b/main/inc/lib/main_api.lib.php @@ -4640,4 +4640,20 @@ function api_get_template($path_type = 'rel') { } $actived_theme_path = $template_path.$actived_theme.DIRECTORY_SEPARATOR; return $actived_theme_path; +} + +/** + * Check brosers support for svg files + * @return bool + * + * @author Juan Carlos RaƱa Trabado + */ +function support_svg() { + $browser_info = get_browser($_SERVER["HTTP_USER_AGENT"], true); + //print_r($browser_info); + if (($browser_info[browser]=='IE' && $browser_info[majorver]>8) || ($browser_info[browser]=='Firefox' && $browser_info[majorver]>1)||($browser_info[browser]=='Safari' && $browser_info[majorver]>3) || $browser_info[browser]=='Chrome' || ($browser_info[browser]=='Opera' && $browser_info[majorver]>9)){ + return true; + }else{ + return false; + } } \ No newline at end of file diff --git a/main/newscorm/resourcelinker.inc.php b/main/newscorm/resourcelinker.inc.php index f5d5159a29..1446fa1e1e 100755 --- a/main/newscorm/resourcelinker.inc.php +++ b/main/newscorm/resourcelinker.inc.php @@ -271,7 +271,11 @@ function display_addedresource_link($type, $id, $style = '') { $ext = explode('.', $filename); $ext = strtolower($ext[sizeof($ext)-1]); $myrow['path'] = rawurlencode($myrow['path']); - $in_frames = in_array($ext, array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png')); + if (support_svg()){ + $in_frames = in_array($ext, array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png', 'svg','svgz')); + }else{ + $in_frames = in_array($ext, array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png')); + } echo ' '.$filename."
\n"; break; case 'Externallink':