From 7033616bf31b47459ab0a7140ffbbdb4e66f68d3 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Mon, 14 Jan 2013 17:06:17 +0000
Subject: [PATCH] Suppression d'un warning sur les array_merge
---
library/Class/Systeme/ModulesMenu.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/library/Class/Systeme/ModulesMenu.php b/library/Class/Systeme/ModulesMenu.php
index 6220b22171c..df890392202 100644
--- a/library/Class/Systeme/ModulesMenu.php
+++ b/library/Class/Systeme/ModulesMenu.php
@@ -150,7 +150,9 @@ class Class_Systeme_ModulesMenu extends Class_Systeme_ModulesAbstract {
public function getUrl($type, $preferences) {
$module = $this->getFonction($type);
- $preferences = array_merge($module->getDefaultValues(),$preferences);
+ $preferences = is_array($preferences)
+ ? array_merge($module->getDefaultValues(),$preferences)
+ : $module->getDefaultValues();
return ['url' => $module->getUrl($preferences),
'target' => $module->shouldOpenInNewWindow($preferences) ? '_blank' : ''];
--
GitLab