From 03e7c19a5d693d3c58ce4fc297bfd7b8707c71cf Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Tue, 9 Feb 2016 17:58:37 +1100 Subject: [PATCH] Fixes issue where twig passed null Minor update to dropdown docs --- modules/cms/classes/Controller.php | 3 ++ modules/system/assets/ui/docs/dropdown.md | 60 +++++++++++------------ 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php index 01a27602a..7647f8cf7 100644 --- a/modules/cms/classes/Controller.php +++ b/modules/cms/classes/Controller.php @@ -1089,6 +1089,9 @@ class Controller */ if (is_bool($parameters)) { $routePersistence = $parameters; + } + + if (!is_array($parameters)) { $parameters = []; } diff --git a/modules/system/assets/ui/docs/dropdown.md b/modules/system/assets/ui/docs/dropdown.md index 42932293e..44f4b3315 100644 --- a/modules/system/assets/ui/docs/dropdown.md +++ b/modules/system/assets/ui/docs/dropdown.md @@ -1,35 +1,35 @@ Customized dropdown menu -# Example +### Small +
+ Add small -
-
- Add small - - -
-
- Add large - - -
+ +
+ +### Large + +
+ Add large + +