tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 08:44:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

CS: Fix for DbAdapter, Auth/Manager and Preferences/DbStore

Browse Source 
refs #4596
This commit is contained in:
Marius Hein 2013-08-26 10:08:32 +02:00
parent 49cf62a9dc
commit 0c69dbf482
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/Icinga/Authentication/Manager.php
View File

@ -188,7 +188,7 @@ class Manager
{ {
$type = ucwords(strtolower($backendConfig->backend)); $type = ucwords(strtolower($backendConfig->backend));
if (!$type) { if (!$type) {
Logger::warn('No type given...'); Logger::warn('Backend has no type configured. (e.g. backend=ldap)');
return null; return null;
} }
try { try {
@ -214,7 +214,8 @@ class Manager
* in the current session * in the current session
* *
* @return Boolean true on success, otherwise false * @return Boolean true on success, otherwise false
**/ * @throws ConfigError
*/
public function authenticate(Credentials $credentials, $persist = true) public function authenticate(Credentials $credentials, $persist = true)
{ {
if (!$this->userBackend) { if (!$this->userBackend) {

1
library/Icinga/User/Preferences/DbStore.php
View File

@ -93,7 +93,6 @@ class DbStore implements LoadInterface, FlushObserverInterface
public function setDbAdapter(Zend_Db_Adapter_Abstract $db) public function setDbAdapter(Zend_Db_Adapter_Abstract $db)
{ {
$this->db = $db; $this->db = $db;
$this->db->getProfiler()->setEnabled(true);
} }