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

Merge branch '1.0.x' into activity

This commit is contained in:
Evan Prodromou 2011-08-23 00:17:39 -04:00
parent eb6cece8e4 ce5b44158e
commit c712eefe14
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
classes/Memcached_DataObject.php
View File

@ -34,11 +34,12 @@ class Memcached_DataObject extends Safe_DataObject
{
if (is_null($v)) {
$v = $k;
// XXX: HACK!
$i = new $cls;
$keys = $i->keys();
$keys = self::pkeyCols($cls);
if (count($keys) > 1) {
// FIXME: maybe call pkeyGet() ourselves?
throw new Exception('Use pkeyGet() for compound primary keys');
}
$k = $keys[0];
unset($i);
}
$i = Memcached_DataObject::getcached($cls, $k, $v);
if ($i === false) { // false == cache miss

7
lib/moremenu.php
View File

@ -81,7 +81,12 @@ class MoreMenu extends Menu
}
foreach ($toShow as $item) {
list($actionName, $args, $label, $description, $id) = $item;
if (count($item) == 5) {
list($actionName, $args, $label, $description, $id) = $item;
} else {
list($actionName, $args, $label, $description) = $item;
$id = null;
}
$this->item($actionName, $args, $label, $description, $id);
}