eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '0.7.x' into 0.8.x

Browse Source 
Conflicts:
	classes/Notice.php
	classes/Profile.php
	lib/common.php
	lib/util.php
	scripts/getvaliddaemons.php
	scripts/stopdaemons.sh
This commit is contained in:
Evan Prodromou
2009-06-08 11:55:32 -07:00
parent 1a126032ef 265e2bd58d
commit adfb79a9bb
26 changed files with 600 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/getvaliddaemons.php
View File

@@ -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 ";