diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-11-01 10:43:37 -0700 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-11-01 10:43:37 -0700 |
| commit | 7ae4b35d787bf51ac98baf1c1818f580e0195016 (patch) | |
| tree | 5a7498da81e41aa68d2456068a612f5608a3b405 /modules/gallery/libraries | |
| parent | 268ab9e079460a8e876d5b45b06ca4d9eecf767b (diff) | |
| parent | 488b67014b44baf8bb19deaf7c77e87a95be220b (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/libraries')
| -rw-r--r-- | modules/gallery/libraries/IdentityProvider.php | 6 |
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) { |