summaryrefslogtreecommitdiff
path: root/lib/queuehandler.php
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-11-10 00:43:58 -0800
committerZach Copley <zach@status.net>2009-11-10 00:43:58 -0800
commitcae06a49ea60cacb926f27b18b88a8a7f801f011 (patch)
tree4a1a8b448666f1dd7ff1a8395d7ce75ef4933956 /lib/queuehandler.php
parentdbb86f948684cd5a5a49f6881f50082698fd39d1 (diff)
parent223fee2ad1430e827830265c9fe97f4d025bb060 (diff)
Merge branch '0.9.x' into finish-account-api
* 0.9.x: (26 commits) just sent a http 200 for the check-fancy from install.php Add a new event: CanUserChangeField shorten flag notification and include a class Added flag icon for UserFlag plugin Fixed notice option alignment in IE add a method to Theme class to list available themes Updated Realtime plugin to use the util's NoticeReply object Localisation updates from translatewiki.net (2009-11-08) Update pot again Rebuild pot file *without* --join-existing to get rid of the cruft. Not sure why "--join-existing" must be in. Only thing I can think of is manual additions, which I could not find. Revert "More precise field label" Remove more contractions Revert "* [Cc]an't -> [Cc]annot" Revert "More specifics on 'address'" * [Cc]an't -> [Cc]annot Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places" add utilities for calculating local and installation theme root dirs Harmonise UI message "No such user." Restructure theme.php to define a class Theme entity_action responses look more inactive now ...
Diffstat (limited to 'lib/queuehandler.php')
-rw-r--r--lib/queuehandler.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/queuehandler.php b/lib/queuehandler.php
index cd43b1e09..7c07ca4f9 100644
--- a/lib/queuehandler.php
+++ b/lib/queuehandler.php
@@ -96,8 +96,8 @@ class QueueHandler extends Daemon
* Initialization, run when the queue handler starts.
* If this function indicates failure, the handler run will be aborted.
*
- * @fixme run() will abort if this doesn't return true,
- * but some subclasses don't bother.
+ * @fixme run() will abort if this does not return true,
+ * but some subclasses do not bother.
* @return boolean true on success, false on failure
*/
function start()
@@ -108,8 +108,8 @@ class QueueHandler extends Daemon
* Cleanup, run when the queue handler ends.
* If this function indicates failure, a warning will be logged.
*
- * @fixme run() will throw warnings if this doesn't return true,
- * but many subclasses don't bother.
+ * @fixme run() will throw warnings if this does not return true,
+ * but many subclasses do not bother.
* @return boolean true on success, false on failure
*/
function finish()
@@ -137,7 +137,7 @@ class QueueHandler extends Daemon
* method, which passes control back to our handle_notice() method for
* each notice that comes in on the queue.
*
- * Most of the time this won't need to be overridden in a subclass.
+ * Most of the time this will not need to be overridden in a subclass.
*
* @return boolean true on success, false on failure
*/
@@ -173,7 +173,7 @@ class QueueHandler extends Daemon
* Called by QueueHandler after each handled item or empty polling cycle.
* This is a good time to e.g. service your XMPP connection.
*
- * Doesn't need to be overridden if there's no maintenance to do.
+ * Does not need to be overridden if there's no maintenance to do.
*
* @param int $timeout seconds to sleep if there's nothing to do
*/