diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-08 11:55:32 -0700 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-08 11:55:32 -0700 |
commit | adfb79a9bbdfb43f35c0f022c1de6118b10ce115 (patch) | |
tree | e14ec0cc5161cfd5cc321eaaa5b8eed07df952de /scripts/getvaliddaemons.php | |
parent | 1a126032efbcb265a59f4d682bd072251f857c97 (diff) | |
parent | 265e2bd58de2a01e0d7840310eb44b21b70e3914 (diff) |
Merge branch '0.7.x' into 0.8.x
Conflicts:
classes/Notice.php
classes/Profile.php
lib/common.php
lib/util.php
scripts/getvaliddaemons.php
scripts/stopdaemons.sh
Diffstat (limited to 'scripts/getvaliddaemons.php')
-rwxr-xr-x | scripts/getvaliddaemons.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php index a10233e69..4e49f9bd4 100755 --- a/scripts/getvaliddaemons.php +++ b/scripts/getvaliddaemons.php @@ -25,7 +25,6 @@ * daemon names. */ - # Abort if called from a web server if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { print "This script must be run from the command line\n"; @@ -51,5 +50,4 @@ echo "ombqueuehandler.php "; echo "twitterqueuehandler.php "; echo "facebookqueuehandler.php "; echo "pingqueuehandler.php "; -echo "inboxqueuehandler.php "; echo "smsqueuehandler.php "; |