Merge remote-tracking branch 'origin/3.8' into develop
# Conflicts: # htdocs/printing/admin/printing.php
This commit is contained in:
commit
af55c8467b
@ -229,7 +229,7 @@ if ($mode == 'test' && $user->admin)
|
|||||||
$langs->load($driver);
|
$langs->load($driver);
|
||||||
$printer = new $classname($db);
|
$printer = new $classname($db);
|
||||||
//print '<pre>'.print_r($printer, true).'</pre>';
|
//print '<pre>'.print_r($printer, true).'</pre>';
|
||||||
if ($printer->getlist_available_printers) {
|
if (count($printer->getlist_available_printers)) {
|
||||||
print $printer->listAvailablePrinters();
|
print $printer->listAvailablePrinters();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user