From 6dc15b94d28412f1553a3464ebdc84c7b7339d99 Mon Sep 17 00:00:00 2001
From: dleffler <dleffler@hughes.net>
Date: Mon, 30 Oct 2017 18:41:01 -0400
Subject: [PATCH] update some jquery addon .less files to properly include all
 needed system .less files; fix warning in form controller

---
 external/jquery/addons/less/bootstrap-dialog.less       | 2 +-
 external/jquery/addons/less/bootstrap-fileupload.less   | 1 +
 external/jquery/addons/less/fileinput.less              | 3 +++
 framework/modules/forms/controllers/formsController.php | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/external/jquery/addons/less/bootstrap-dialog.less b/external/jquery/addons/less/bootstrap-dialog.less
index 2b2202431f..83f9116359 100644
--- a/external/jquery/addons/less/bootstrap-dialog.less
+++ b/external/jquery/addons/less/bootstrap-dialog.less
@@ -1,7 +1,7 @@
+@import "../../../bootstrap3/less/mixins.less";
 @import "../../../bootstrap3/less/variables.less";  //exp Just in case themes aren't overriding all variables
 @import "../../../bootstrap3/less/@{swatch}/variables.less"; //exp Modify this for custom colors, font-sizes, etc
 @import "../@{themepath}/variables.less"; //exp Modify this for theme colors, font-sizes, etc
-@import "../../../bootstrap3/less/mixins.less";
 
 .bootstrap-dialog {
 
diff --git a/external/jquery/addons/less/bootstrap-fileupload.less b/external/jquery/addons/less/bootstrap-fileupload.less
index 2e44c638f6..08e57b9bdf 100644
--- a/external/jquery/addons/less/bootstrap-fileupload.less
+++ b/external/jquery/addons/less/bootstrap-fileupload.less
@@ -1,6 +1,7 @@
 @import "../../../bootstrap/less/mixins.less";
 @import "../../../bootstrap/less/variables.less";
 @import "../../../bootstrap/less/@{swatch}/variables.less";
+
 // Fileupload.less
 // CSS for file upload button and fileupload widget
 // ------------------------------------------------
diff --git a/external/jquery/addons/less/fileinput.less b/external/jquery/addons/less/fileinput.less
index 84b692a1cc..4a37c0d894 100644
--- a/external/jquery/addons/less/fileinput.less
+++ b/external/jquery/addons/less/fileinput.less
@@ -1,5 +1,8 @@
+@import "../../../bootstrap3/less/mixins.less";
 @import "../../../bootstrap3/less/variables.less";
 @import "../../../bootstrap3/less/@{swatch}/variables.less";
+@import "../@{themepath}/variables.less"; //exp Modify this for theme colors, font-sizes, etc
+
 // Fileinput.less
 // CSS for file upload button and fileinput widget
 // ------------------------------------------------
diff --git a/framework/modules/forms/controllers/formsController.php b/framework/modules/forms/controllers/formsController.php
index 11ff604526..dbc9c46438 100644
--- a/framework/modules/forms/controllers/formsController.php
+++ b/framework/modules/forms/controllers/formsController.php
@@ -178,6 +178,8 @@ public function showall() {
                 }
 
                 $limit = (isset($this->params['limit']) && $this->params['limit'] != '') ? $this->params['limit'] : 10;
+                if (empty($this->params['view']))
+                    $this->params['view'] = null;
                 if ($this->params['view'] !== 'showall_portfolio')
                     $limit = 0;