lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix travis error

Browse Source
This commit is contained in:
Laurent Destailleur 2017-04-14 11:28:19 +02:00
parent 39ebaec064
commit 4e021c123b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.formfile.class.php
View File

@ -869,7 +869,7 @@ class FormFile
else $this->infofiles['extensions'][$ext]++; else $this->infofiles['extensions'][$ext]++;
// Preview // Preview
if (! empty($conf->use_javascript_ajax) && ! empty($conf->browser->layout != 'phone')) if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
{ {
$tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1); $tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1);
if ($tmparray && $tmparray['url']) $tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>'; if ($tmparray && $tmparray['url']) $tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';

4
htdocs/main.inc.php
View File

@ -1899,7 +1899,7 @@ if (! function_exists("llxFooter"))
if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent; if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
// TODO Move this in lib_head.js // TODO Move this in lib_head.js.php
// Wrapper to show tooltips (html or onclick popup) // Wrapper to show tooltips (html or onclick popup)
if (! empty($conf->use_javascript_ajax) && empty($conf->dol_no_mouse_hover)) if (! empty($conf->use_javascript_ajax) && empty($conf->dol_no_mouse_hover))
@ -1922,7 +1922,7 @@ if (! function_exists("llxFooter"))
} }
// Wrapper to manage document_preview // Wrapper to manage document_preview
if (! empty($conf->use_javascript_ajax) && ! empty($conf->browser->layout != 'phone')) if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
{ {
print "\n<!-- JS CODE TO ENABLE document_preview -->\n"; print "\n<!-- JS CODE TO ENABLE document_preview -->\n";
print '<script type="text/javascript"> print '<script type="text/javascript">