Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

diff --combined lib/action.php
index 0c4d0181db50302996e6c82f0e49db070989caf1,a468c638cd59aba805330352e672451fe568d66a..455ebeff0beb4f3b9898b067243fec04d5ee87d4
--- 1/lib/action.php
--- 2/lib/action.php
+++ b/lib/action.php
@@@ -474,7 -474,10 +474,10 @@@ class Action extends HTMLOutputter // l
      function showCore()
      {
          $this->elementStart('div', array('id' => 'core'));
-         $this->showLocalNavBlock();
+         if (Event::handle('StartShowLocalNavBlock', array($this))) {
+             $this->showLocalNavBlock();
+             Event::handle('EndShowLocalNavBlock', array($this));
+         }
          if (Event::handle('StartShowContentBlock', array($this))) {
              $this->showContentBlock();
              Event::handle('EndShowContentBlock', array($this));
@@@ -657,8 -660,6 +660,8 @@@
                              _('Source'));
              $this->menuItem(common_local_url('doc', array('title' => 'contact')),
                              _('Contact'));
 +            $this->menuItem(common_local_url('doc', array('title' => 'badge')),
 +                            _('Badge'));
              Event::handle('EndSecondaryNav', array($this));
          }
          $this->elementEnd('ul');