From acdb5bf2b7e516ece1ab60256235973d2bfb0b04 Mon Sep 17 00:00:00 2001 From: Steve Clay Date: Thu, 29 Nov 2012 15:29:42 -0500 Subject: Don't need htmlawed for ?view, prevent "Array" from being used as view type --- engine/lib/views.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engine') diff --git a/engine/lib/views.php b/engine/lib/views.php index 8a0642c2b..8b10fe3e0 100644 --- 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; } -- cgit v1.2.3