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

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

CRM/Utils/System/Base.php

@@ -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 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.
    *
-  function userLoginFinalize($edit = array()){
+   * @param array params
+   *
+   * FIXME: Document values accepted/required by $params
+   */
+  function userLoginFinalize($params = array()){
   }
-  */
 }
 

CRM/Utils/System/Drupal.php

@@ -653,14 +653,17 @@ AND    u.status = 1
   }
 
   /**
-   * 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.
    *
-  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

CRM/Utils/System/Drupal6.php

@@ -584,14 +584,17 @@ SELECT name, mail
   }
 
   /**
-   * 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.
    *
-  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