Merge branch '0.8.x' into 0.9.x

Conflicts:
	EVENTS.txt

2 files changed, 10 insertions, 12 deletions

diff --git a/classes/Notice.php b/classes/Notice.php
index 2138e0561..f3fa9af78 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -909,7 +909,8 @@ class Notice extends Memcached_DataObject
                 $qry .= '('.$id.', '.$this->id.', '.$source.", '".$this->created. "') ";
                 $cnt++;
                 if (rand() % NOTICE_INBOX_SOFT_LIMIT == 0) {
-                    Notice_inbox::gc($id);
+                    // FIXME: Causes lag in replicated servers
+                    // Notice_inbox::gc($id);
                 }
                 if ($cnt >= MAX_BOXCARS) {
                     $inbox = new Notice_inbox();
diff --git a/lib/action.php b/lib/action.php
index 635b7c373..02793f069 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -120,16 +120,14 @@ class Action extends HTMLOutputter // lawsuit
     {
         // XXX: attributes (profile?)
         $this->elementStart('head');
-        if (Event::handle('StartShowHeadElements', array($this))) {
-            $this->showTitle();
-            $this->showShortcutIcon();
-            $this->showStylesheets();
-            $this->showOpenSearch();
-            $this->showFeeds();
-            $this->showDescription();
-            $this->extraHead();
-            Event::handle('EndShowHeadElements', array($this));
-        }
+        $this->showTitle();
+        $this->showShortcutIcon();
+        $this->showStylesheets();
+        $this->showScripts();
+        $this->showOpenSearch();
+        $this->showFeeds();
+        $this->showDescription();
+        $this->extraHead();
         $this->elementEnd('head');
     }
 
@@ -354,7 +352,6 @@ class Action extends HTMLOutputter // lawsuit
             Event::handle('EndShowFooter', array($this));
         }
         $this->elementEnd('div');
-        $this->showScripts();
         $this->elementEnd('body');
     }