Merge remote-tracking branch 'origin/3.8' into develop

# Conflicts:
#	htdocs/printing/admin/printing.php
This commit is contained in:
Juanjo Menent 2015-08-07 10:14:30 +02:00
commit af55c8467b

View File

@ -229,7 +229,7 @@ if ($mode == 'test' && $user->admin)
$langs->load($driver);
$printer = new $classname($db);
//print '<pre>'.print_r($printer, true).'</pre>';
if ($printer->getlist_available_printers) {
if (count($printer->getlist_available_printers)) {
print $printer->listAvailablePrinters();
}
else {