Don't need htmlawed for ?view, prevent "Array" from being used as view type

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 8a0642c2b8eafa5e094d090a941ca65bc5bcc669..8b10fe3e030223f96a95ec940e6febe9b8b98d81 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -101,15 +101,15 @@ function elgg_get_viewtype() {
                return $CURRENT_SYSTEM_VIEWTYPE;
        }
 
-       $viewtype = get_input('view', NULL);
-       if ($viewtype) {
+       $viewtype = get_input('view', '', false);
+       if (is_string($viewtype) && $viewtype !== '') {
                // only word characters allowed.
-               if (!preg_match('[\W]', $viewtype)) {
+               if (!preg_match('/\W/', $viewtype)) {
                        return $viewtype;
                }
        }
 
-       if (isset($CONFIG->view) && !empty($CONFIG->view)) {
+       if (!empty($CONFIG->view)) {
                return $CONFIG->view;
        }