Merge pull request #2571 from mlutfy/4.4-crm13859

CRM-13859 Backport PR #2195: set database connection to UTF-8 during install (by clandmeter).

diff --git a/CRM/Core/Controller.php b/CRM/Core/Controller.php
index 21a4ac461b3686fa30c2a2e9eee793b5096a610c..6cc187e35201315652747dde45b849d196e974e6 100644 (file)
--- a/CRM/Core/Controller.php
+++ b/CRM/Core/Controller.php
@@ -187,17 +187,11 @@ class CRM_Core_Controller extends HTML_QuickForm_Controller {
     // lets try to get it from the session and/or the request vars
     // we do this early on in case there is a fatal error in retrieving the
     // key and/or session
-    $this->_entryURL = CRM_Utils_Request::retrieve(
-      'entryURL',
-      'String',
-      $this,
-      FALSE,
-      NULL,
-      $_REQUEST
-    );
+    $this->_entryURL =
+      CRM_Utils_Request::retrieve('entryURL', 'String', $this);
 
     // add a unique validable key to the name
-    $name         = CRM_Utils_System::getClassName($this);
+    $name = CRM_Utils_System::getClassName($this);
     if ($name == 'CRM_Core_Controller_Simple' && !empty($scope)) {
       // use form name if we have, since its a lot better and
       // definitely different for different forms