diff options
| author | Zach Copley <zach@status.net> | 2009-11-10 15:25:43 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2009-11-10 15:25:43 -0800 |
| commit | db64b612961c37477d0729e9ff4f882fb5df7b8d (patch) | |
| tree | 9ae5a31b58a289fc838c29c34230edd3962c231f /actions/twitapisearchatom.php | |
| parent | ee3fc8ba03ddd8451cac60547af72ea2cef7dc6a (diff) | |
| parent | 91332cdadc20e721c22fcf22ca1773cedbde95c5 (diff) | |
Merge branch '0.9.x' into finish-account-api
* 0.9.x:
Added a events for the settings menu items
Bringing Sphinx search support up to code: broken out to a plugin, now supports multiple sites on a single server.
Changed to Evan's event style and added an AuthPlugin superclass
add geo output to statuses in json, xml, atom, rss in API
Localisation updates from translatewiki.net (2009-11-10)
Localisation updates from translatewiki.net
Update pot
add lat and long parameters to api/statuses/update
change credential check to work more like other events
fixup output of object attributes in db error code
Performance fix for subscription/subscriber lists based on feedback from ops.
Adjusting indexes to make favorites query more efficient, based on feedback from ops.
Revert untested code; spews PHP notice warnings on every page view: "just sent a http 200 for the check-fancy from install.php"
Added hook for the Group navigation items
Updated block @title text (shouldn't say from group)
Updated group block markup
Revert "Remove more contractions"
Diffstat (limited to 'actions/twitapisearchatom.php')
| -rw-r--r-- | actions/twitapisearchatom.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 511d7cdc6..526ca2ae8 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -161,7 +161,7 @@ class TwitapisearchatomAction extends ApiAction // lcase it for comparison $q = strtolower($this->query); - $search_engine = $notice->getSearchEngine('identica_notices'); + $search_engine = $notice->getSearchEngine('notice'); $search_engine->set_sort_mode('chron'); $search_engine->limit(($this->page - 1) * $this->rpp, $this->rpp + 1, true); @@ -250,7 +250,7 @@ class TwitapisearchatomAction extends ApiAction } // FIXME: this alternate link is not quite right because our - // web-based notice search does not support a rpp (responses per + // web-based notice search doesn't support a rpp (responses per // page) param yet $this->element('link', array('type' => 'text/html', |