Merge branch '0.9.x' into openidplugin

[quix0rs-gnu-social.git] / plugins / OpenID / openidsettings.php

diff --git a/plugins/OpenID/openidsettings.php b/plugins/OpenID/openidsettings.php
index 26bf6483660823175c87367fe44ad9d08aa0f16f..57389903d1230864fbf1eee9e9cf174723c9be54 100644 (file)
--- a/plugins/OpenID/openidsettings.php
+++ b/plugins/OpenID/openidsettings.php
@@ -82,6 +82,12 @@ class OpenidsettingsAction extends AccountSettingsAction
 
     function showContent()
     {
+        if (!common_config('openid', 'enabled')) {
+            $this->element('div', array('class' => 'error'),
+                           _('OpenID is not available.'));
+            return;
+        }
+
         $user = common_current_user();
 
         $this->elementStart('form', array('method' => 'post',