Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

2013-01-02 17:09:44 +01:00
parent f7754045fb 384c610d81
commit 13ad25f331
2 changed files with 7 additions and 4 deletions
@@ -273,11 +273,14 @@ class AdminInvoicesControllerCore extends AdminController

 	protected function getInvoicesModelsFromDir($directory)
 	{
-		$templates = array();
+		$templates = false;

 		if (is_dir($directory))
 			$templates = glob($directory.'invoice-*.tpl');

+		if (!$templates)
+			$templates = array();
+
 		return $templates;
 	}
 }