GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.8.x' into 0.9.x

Browse Source 
Conflicts:
	EVENTS.txt
This commit is contained in:
Evan Prodromou 2009-09-24 17:24:15 -04:00
commit 93b7e60115
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/Notice.php
View File

@ -909,7 +909,8 @@ class Notice extends Memcached_DataObject
$qry .= '('.$id.', '.$this->id.', '.$source.", '".$this->created. "') "; $qry .= '('.$id.', '.$this->id.', '.$source.", '".$this->created. "') ";
$cnt++; $cnt++;
if (rand() % NOTICE_INBOX_SOFT_LIMIT == 0) { 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) { if ($cnt >= MAX_BOXCARS) {
$inbox = new Notice_inbox(); $inbox = new Notice_inbox();

19
lib/action.php
View File

@ -120,16 +120,14 @@ class Action extends HTMLOutputter // lawsuit
{ {
// XXX: attributes (profile?) // XXX: attributes (profile?)
$this->elementStart('head'); $this->elementStart('head');
if (Event::handle('StartShowHeadElements', array($this))) { $this->showTitle();
$this->showTitle(); $this->showShortcutIcon();
$this->showShortcutIcon(); $this->showStylesheets();
$this->showStylesheets(); $this->showScripts();
$this->showOpenSearch(); $this->showOpenSearch();
$this->showFeeds(); $this->showFeeds();
$this->showDescription(); $this->showDescription();
$this->extraHead(); $this->extraHead();
Event::handle('EndShowHeadElements', array($this));
}
$this->elementEnd('head'); $this->elementEnd('head');
} }
@ -354,7 +352,6 @@ class Action extends HTMLOutputter // lawsuit
Event::handle('EndShowFooter', array($this)); Event::handle('EndShowFooter', array($this));
} }
$this->elementEnd('div'); $this->elementEnd('div');
$this->showScripts();
$this->elementEnd('body'); $this->elementEnd('body');
} }