Merge pull request civicrm#12 from ravishnair/CRM-13374

dlobo · dlobo · commit 4ec597cf1564 · 2013-09-24T10:55:32.000-07:00
fix for CRM-13374
diff --git a/site/civicrm.php b/site/civicrm.php
@@ -56,12 +56,12 @@ function civicrm_invoke() {
 
   // add all the values from the itemId param
   // overrride the GET values if conflict
-  if (CRM_Utils_Array::value('Itemid', $_GET)) {
+  if (CRM_Utils_Array::value('Itemid', $_REQUEST)) {
     $component = JComponentHelper::getComponent('com_civicrm');
     $menu      = JSite::getMenu();
-    $params    = $menu->getParams($_GET['Itemid']);
+    $params    = $menu->getParams($_REQUEST['Itemid']);
     $args      = array('task', 'id', 'gid', 'pageId', 'action', 'csid', 'component');
-    $view      = CRM_Utils_Array::value('view', $_GET);
+    $view      = CRM_Utils_Array::value('view', $_REQUEST);
     if ($view) {
       $args[] = 'reset';
     }
diff --git a/site/elements/civievents.php b/site/elements/civievents.php
@@ -55,7 +55,6 @@ protected function getInput() {
     $params = array(
       'version' => '3',
       'is_active' => 1,
-      'isCurrent' => 1,
       'return.title' => 1,
       'return.id' => 1,
       'return.end_date' => 1,
@@ -66,11 +65,7 @@ protected function getInput() {
     $options     = array();
     $options[]   = JHTML::_('select.option', '', JText::_('- Select Event -'));
     foreach ($events['values'] as $event) {
-      if (strtotime($event['start_date']) >= strtotime($currentdate) ||
-        strtotime($event['end_date']) >= strtotime($currentdate)
-      ) {
-        $options[] = JHTML::_('select.option', $event['id'], $event['event_title']);
-      }
+      $options[] = JHTML::_('select.option', $event['id'], $event['event_title']);
     }
 
     return JHTML::_('select.genericlist', $options, $name, NULL, 'value', 'text', $value);
