eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into 0.9.x

Browse Source 
Conflicts:
	lib/router.php
This commit is contained in:
Evan Prodromou
2010-11-30 14:46:26 -05:00
parent 0cc332eab6 af31767b63
commit 7aa201fa52
3 changed files with 122 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/router.php
View File

@@ -128,12 +128,13 @@ class Router
{
if (empty($this->m)) {
$k = self::cacheKey();
$m = Cache::get($k);
$c = Cache::instance();
$m = $c->get($k);
if (!empty($m)) {
$this->m = $m;
} else {
$this->m = $this->initialize();
Cache::set($k, $this->m);
$c->set($k, $this->m);
}
}
}
@@ -156,18 +157,18 @@ class Router
static function cacheKey()
{
$plugins = StatusNet::getActivePlugins();
$names = array();
$names = array();
foreach ($plugins as $plugin) {
$names[] = $plugin[0];
}
foreach ($plugins as $plugin) {
$names[] = $plugin[0];
}
$names = array_unique($names);
asort($names);
$names = array_unique($names);
asort($names);
// Unique enough.
// Unique enough.
$uniq = crc32(implode(',', $names));
$uniq = crc32(implode(',', $names));
return Cache::key('router:'.STATUSNET_VERSION.':'.$uniq);
}