1 files changed, 16 insertions, 18 deletions

diff --git a/lib/action.php b/lib/action.php
index fafb2c6fc..8056cb9ec 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -120,14 +120,17 @@ class Action extends HTMLOutputter // lawsuit
     {
         // XXX: attributes (profile?)
         $this->elementStart('head');
-        $this->showTitle();
-        $this->showShortcutIcon();
-        $this->showStylesheets();
-        $this->showScripts();
-        $this->showOpenSearch();
-        $this->showFeeds();
-        $this->showDescription();
-        $this->extraHead();
+        if (Event::handle('StartHeadChildren', array($this))) {
+            $this->showTitle();
+            $this->showShortcutIcon();
+            $this->showStylesheets();
+            $this->showScripts();
+            $this->showOpenSearch();
+            $this->showFeeds();
+            $this->showDescription();
+            $this->extraHead();
+            Event::handle('EndHeadChildren', array($this));
+        }
         $this->elementEnd('head');
     }
 
@@ -442,17 +445,12 @@ class Action extends HTMLOutputter // lawsuit
                                 _('Logout'), _('Logout from the site'), false, 'nav_logout');
             }
             else {
-                if (!common_config('site', 'openidonly')) {
-                    if (!common_config('site', 'closed')) {
-                        $this->menuItem(common_local_url('register'),
-                                        _('Register'), _('Create an account'), false, 'nav_register');
-                    }
-                    $this->menuItem(common_local_url('login'),
-                                    _('Login'), _('Login to the site'), false, 'nav_login');
-                } else {
-                    $this->menuItem(common_local_url('openidlogin'),
-                                    _('OpenID'), _('Login with OpenID'), false, 'nav_openid');
+                if (!common_config('site', 'closed')) {
+                    $this->menuItem(common_local_url('register'),
+                                    _('Register'), _('Create an account'), false, 'nav_register');
                 }
+                $this->menuItem(common_local_url('login'),
+                                _('Login'), _('Login to the site'), false, 'nav_login');
             }
             $this->menuItem(common_local_url('doc', array('title' => 'help')),
                             _('Help'), _('Help me!'), false, 'nav_help');