Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-18-07-53-48

kurund · kurund · commit 1fb7a065913b · 2014-02-18T07:53:52.000+05:30
diff --git a/site/civicrm.php b/site/civicrm.php
@@ -58,8 +58,9 @@ function civicrm_invoke() {
   // overrride the GET values if conflict
   if (!empty($_REQUEST['Itemid'])) {
     $component = JComponentHelper::getComponent('com_civicrm');
-    $menu      = JSite::getMenu();
-    $params    = $menu->getParams($_REQUEST['Itemid']);
+    $app       = JFactory::getApplication();
+    $menu      = $app->getMenu();
+    $params    = $menu->getParams($app->input->get('Itemid'));
     $args      = array('task', 'id', 'gid', 'pageId', 'action', 'csid', 'component');
     $view      = CRM_Utils_Array::value('view', $_REQUEST);
     if ($view) {
