summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-10-31 14:11:06 -0700
committerTim Almdal <tnalmdal@shaw.ca>2009-10-31 14:11:06 -0700
commit8db2406c0091212899f388f5cd17947434a3c734 (patch)
tree93d77ffd6843ee539ce3ff3b3d6b7e0d76daa5ad
parent61216b72050229f1edd397d8d41220cabef1c15a (diff)
Added a config parameter to the IdentityProvider to specifiy the configuration. This allows the ldap installer to instantiate the ldap Identity provider to use in the install and uninstall methods
-rw-r--r--modules/gallery/libraries/IdentityProvider.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/gallery/libraries/IdentityProvider.php b/modules/gallery/libraries/IdentityProvider.php
index aa519bd3..e213ae97 100644
--- a/modules/gallery/libraries/IdentityProvider.php
+++ b/modules/gallery/libraries/IdentityProvider.php
@@ -62,8 +62,10 @@ class IdentityProvider_Core {
*
* @return void
*/
- public function __construct() {
- $config = module::get_var("gallery", "identity_provider", "user");
+ public function __construct($config=null) {
+ if (empty($config)) {
+ $config = module::get_var("gallery", "identity_provider", "user");
+ }
// Test the config group name
if (($this->config = Kohana::config("identity." . $config)) === NULL) {