|
From: <rgr...@us...> - 2013-08-21 17:12:03
|
Revision: 11961
http://sourceforge.net/p/xoops/svn/11961
Author: rgriffith
Date: 2013-08-21 17:11:58 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
Error on login
The dao parameter to Xoops_Auth_Xoops was typed to a specific database object which caused errors, XoopsMySQLDatabaseSafe vs. XoopsConnection. Since the parameter is only used to set property _dao which is never referenced again, removed type. Also, changed factory to pass null.
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/xoops_lib/Xoops/Auth/Factory.php
XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/xoops_lib/Xoops/Auth/Xoops.php
Modified: XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/xoops_lib/Xoops/Auth/Factory.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/xoops_lib/Xoops/Auth/Factory.php 2013-08-21 07:38:42 UTC (rev 11960)
+++ XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/xoops_lib/Xoops/Auth/Factory.php 2013-08-21 17:11:58 UTC (rev 11961)
@@ -45,8 +45,6 @@
static function getAuthConnection($uname)
{
$xoops = Xoops::getInstance();
- $xoops->db();
- global $xoopsDB;
static $auth_instance;
if (!isset($auth_instance)) {
/* @var $config_handler XoopsConfigHandler */
@@ -73,7 +71,7 @@
$dao = null;
switch ($xoops_auth_method) {
case 'xoops':
- $dao = $xoopsDB;
+ $dao = null;
break;
case 'ldap':
$dao = null;
Modified: XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/xoops_lib/Xoops/Auth/Xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/xoops_lib/Xoops/Auth/Xoops.php 2013-08-21 07:38:42 UTC (rev 11960)
+++ XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/xoops_lib/Xoops/Auth/Xoops.php 2013-08-21 17:11:58 UTC (rev 11961)
@@ -36,9 +36,9 @@
/**
* Authentication Service constructor
*
- * @param XoopsConnection|null $dao
+ * @param object|null $dao currently unused in this class
*/
- public function __construct(XoopsConnection $dao = null)
+ public function __construct($dao = null)
{
$this->_dao = $dao;
$this->auth_method = 'xoops';
@@ -47,8 +47,9 @@
/**
* Authenticate user
*
- * @param string $uname
- * @param string $pwd
+ * @param string $uname user name
+ * @param string $pwd password
+ *
* @return bool
*/
public function authenticate($uname, $pwd = null)
|