Merge branch 'CRM-13014' of git://github.com/eileenmcnaughton/civicrm-core into pull...

Conflicts:
	CRM/Utils/System/Base.php
	CRM/Utils/System/Drupal.php
	CRM/Utils/System/Drupal6.php

Also: Update comments

----------------------------------------
* CRM-13014: CiviMobile fatal on non-d7 -Need a UF function for login authenticate
  http://issues.civicrm.org/jira/browse/CRM-13014

diff --cc CRM/Utils/System/Base.php
index 2fceed28f0b1421f39c3e7720eaf0110eec7b020,f9b7d75d50ca6c2ddf1998c861043b15ca953d93..86240021e58050d0593833b5b54a41f5cf655d00
--- 1/CRM/Utils/System/Base.php
--- 2/CRM/Utils/System/Base.php
+++ b/CRM/Utils/System/Base.php
@@@ -126,12 -126,12 +126,15 @@@ abstract class CRM_Utils_System_Base 
    }
  
    /**
-    * Perform an post login activities required by the UF -
-    * e.g. for drupal: records a watchdog message about the new session, saves the login timestamp, calls hook_user op 'login' and generates a new session.
-    * @param array $edit: The array of form values submitted by the user.
 -   * Perform any post login activities required by the CMD -
++   * Perform any post login activities required by the CMS -
+    * e.g. for drupal: records a watchdog message about the new session, saves the login timestamp,
+    * calls hook_user op 'login' and generates a new session.
 -   * @param array params Params to be passed to the CMS function.
 +   *
-   function userLoginFinalize($edit = array()){
++   * @param array params
++   *
++   * FIXME: Document values accepted/required by $params
+    */
+   function userLoginFinalize($params = array()){
    }
-   */
  }
  

diff --cc CRM/Utils/System/Drupal.php
index 6539a9603da6acdce62fc64a08c12b717a015730,236814f6360cc573ad4f68165948cafd831a8b40..0f7587c8d428a726c315d1b16d81ac9762a16332
--- 1/CRM/Utils/System/Drupal.php
--- 2/CRM/Utils/System/Drupal.php
+++ b/CRM/Utils/System/Drupal.php
@@@ -653,14 -653,14 +653,17 @@@ AND    u.status = 
    }
  
    /**
-    * Perform an post login activities required by the UF -
-    * e.g. for drupal: records a watchdog message about the new session, saves the login timestamp, calls hook_user op 'login' and generates a new session.
-    * @param array $edit: The array of form values submitted by the user.
+    * Perform any post login activities required by the UF -
+    * e.g. for drupal: records a watchdog message about the new session, saves the login timestamp,
+    * calls hook_user op 'login' and generates a new session.
 -   * @param array params Params to be passed to the CMS function. Note there are no require params as drupal instantiates the user global
 +   *
-   function userLoginFinalize($edit = array()){
-     user_login_finalize(&$edit);
++   * @param array params
++   *
++   * FIXME: Document values accepted/required by $params
+    */
+   function userLoginFinalize($params = array()){
+     user_login_finalize($params);
    }
-   */
  
    /**
     * Set a message in the UF to display to a user

diff --cc CRM/Utils/System/Drupal6.php
index 3ea888e48d4bdb40c79654a672ae31a2902f9e5d,78a0cf4d0032d5c0d5291c6e9ffcccbb5091f01a..cc840c67a50c7bbe39d1836efa1b2cf3ec98bca4
--- 1/CRM/Utils/System/Drupal6.php
--- 2/CRM/Utils/System/Drupal6.php
+++ b/CRM/Utils/System/Drupal6.php
@@@ -584,14 -584,14 +584,17 @@@ SELECT name, mai
    }
  
    /**
-    * Perform an post login activities required by the UF -
-    * e.g. for drupal : records a watchdog message about the new session, saves the login timestamp, calls hook_user op 'login' and generates a new session.
-    * @param array $edit: The array of form values submitted by the user.
+    * Perform any post login activities required by the UF -
+    * e.g. for drupal : records a watchdog message about the new session,
+    * saves the login timestamp, calls hook_user op 'login' and generates a new session.
 -   * @param array params Params to be passed to the CMS function. Note there are no require params as drupal instantiates the user global
 +   *
-   function userLoginFinalize($edit = array()){
-     user_authenticate_finalize(&$edit);
++   * @param array params
++   *
++   * FIXME: Document values accepted/required by $params
+    */
+   function userLoginFinalize($params = array()) {
+     user_authenticate_finalize($params);
    }
-   */
  
    /**
     * Set a message in the UF to display to a user