security fix

diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php
index b2d2ed0c07d3fa9484a777209dcd973b66fc89d5..5c6589f34a9f5f98206f39124dd73e913772f13d 100644 (file)
--- a/CRM/Contact/Page/AJAX.php
+++ b/CRM/Contact/Page/AJAX.php
@@ -336,7 +336,7 @@ class CRM_Contact_Page_AJAX {
     }
 
     $config = CRM_Core_Config::singleton();
-    $username = trim(CRM_Utils_Type::escape($_REQUEST['cms_name'], 'String'));
+    $username = trim(CRM_Utils_Array::value('cms_name', $_REQUEST));
 
     $params = array('name' => $username);
 

diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php
index 49bfe0b1377a8e3393c122c0945d964e012b2ade..b5fe44a2c95b571a887932d8f5ab3fb8debb1a7b 100644 (file)
--- a/CRM/Core/Error.php
+++ b/CRM/Core/Error.php
@@ -335,7 +335,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
     if (php_sapi_name() == "cli") {
       print ("Sorry. A non-recoverable error has occurred.\n$message \n$code\n$email\n\n");
       // Fix for CRM-16899
-      //debug_print_backtrace();
+      echo static::formatBacktrace(debug_backtrace());
       die("\n");
       // FIXME: Why doesn't this call abend()?
       // Difference: abend() will cleanup transaction and (via civiExit) store session state