diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-21 16:38:39 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-21 16:38:39 -0400 |
| commit | bacef32aaca791ec5e25bd951094baec0b41df28 (patch) | |
| tree | e0554108a02208e4d26aeed91fd2fe8a870b164f /lib | |
| parent | 9f356b55c6f419468771c0f3c2450010c0242abe (diff) | |
Revert "Added a configuration option to disable OpenID."
This reverts commit 7dc3a90d1252137859a687e32313ea569dcf8796.
Conflicts:
actions/login.php
actions/register.php
lib/accountsettingsaction.php
lib/common.php
lib/logingroupnav.php
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common.php | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/common.php b/lib/common.php index 067a5a2a6..7b0afce51 100644 --- a/lib/common.php +++ b/lib/common.php @@ -175,8 +175,6 @@ $config = 'host' => null, # only set if != server 'debug' => false, # print extra debug info 'public' => array()), # JIDs of users who want to receive the public stream - 'openid' => - array('enabled' => true), 'invite' => array('enabled' => true), 'sphinx' => @@ -383,12 +381,6 @@ if ($_db_name != 'laconica' && !array_key_exists('ini_'.$_db_name, $config['db'] $config['db']['ini_'.$_db_name] = INSTALLDIR.'/classes/laconica.ini'; } -// Ignore openidonly if OpenID is disabled - -if (!$config['openid']['enabled']) { - $config['site']['openidonly'] = false; -} - function __autoload($cls) { if (file_exists(INSTALLDIR.'/classes/' . $cls . '.php')) { |