From ae471605f8f79d3e12aa81f91bd5c48feaa07d15 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Wed, 20 Aug 2014 12:45:02 -0400 Subject: [PATCH] Fixes for events Fix for url's on the event detail page Fix for the name search if nothing is put in than default to first page of event list. --- static/16.phtml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/16.phtml b/static/16.phtml index 701a477..845ca6f 100755 --- a/static/16.phtml +++ b/static/16.phtml @@ -21,6 +21,9 @@ if (defined('COMMON_EVENTS') && COMMON_EVENTS) { $_REQUEST['startMonth'] = $_REQUEST['endMonth'] = date('m/d/Y', $time); } $search = filter_var($_REQUEST['search'], FILTER_VALIDATE_BOOLEAN); + if ($search && isset($_REQUEST['eventName']) && !$eventName = filter_var($_REQUEST['eventName'])) { + $search = false; + } $t = filter_var($_REQUEST['t']); $eventId = filter_var($_REQUEST['eventid'], FILTER_VALIDATE_INT); if (!$t && !$search && !$eventId) { @@ -41,6 +44,7 @@ if (defined('COMMON_EVENTS') && COMMON_EVENTS) { define('COMMON_APP_PATH', $appPath); // now only need to pull in the main file to run the app // pull in admin.php file + unset($GLOBALS['bottomScripts']['external']); require COMMON_APP_PATH . 'Bootstrap.php'; } else { $events = new Toolkit_Events_Display( -- 2.17.1