Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
This commit is contained in:
commit
5a0125691b
@ -109,7 +109,7 @@ class PublictagcloudAction extends Action
|
|||||||
$cutoff = sprintf("notice_tag.created > '%s'",
|
$cutoff = sprintf("notice_tag.created > '%s'",
|
||||||
common_sql_date(time() - common_config('tag', 'cutoff')));
|
common_sql_date(time() - common_config('tag', 'cutoff')));
|
||||||
$tags->selectAdd($calc . ' as weight');
|
$tags->selectAdd($calc . ' as weight');
|
||||||
$tags->addWhere($cutoff);
|
$tags->whereAdd($cutoff);
|
||||||
$tags->groupBy('tag');
|
$tags->groupBy('tag');
|
||||||
$tags->orderBy('weight DESC');
|
$tags->orderBy('weight DESC');
|
||||||
|
|
||||||
|
@ -96,6 +96,30 @@ class Safe_DataObject extends DB_DataObject
|
|||||||
$this->_link_loaded = false;
|
$this->_link_loaded = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Magic function called when someone attempts to call a method
|
||||||
|
* that doesn't exist. DB_DataObject uses this to implement
|
||||||
|
* setters and getters for fields, but neglects to throw an error
|
||||||
|
* when you just misspell an actual method name. This leads to
|
||||||
|
* silent failures which can cause all kinds of havoc.
|
||||||
|
*
|
||||||
|
* @param string $method
|
||||||
|
* @param array $params
|
||||||
|
* @return mixed
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
function __call($method, $params)
|
||||||
|
{
|
||||||
|
$return = null;
|
||||||
|
// Yes, that's _call with one underscore, which does the
|
||||||
|
// actual implementation.
|
||||||
|
if ($this->_call($method, $params, $return)) {
|
||||||
|
return $return;
|
||||||
|
} else {
|
||||||
|
throw new Exception('Call to undefined method ' .
|
||||||
|
get_class($this) . '::' . $method);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Work around memory-leak bugs...
|
* Work around memory-leak bugs...
|
||||||
|
Loading…
Reference in New Issue
Block a user