GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.9.x' into 1.0.x

Browse Source 
Conflicts:
	EVENTS.txt
	lib/imqueuehandler.php
	lib/jabber.php
	lib/util.php
	plugins/Xmpp/Sharing_XMPP.php
This commit is contained in:
Craig Andrews
2010-02-02 17:00:10 -05:00
parent d14651706c f60f2c523f
commit 057ec1fcea
118 changed files with 19107 additions and 11205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/util.php
View File

@@ -178,7 +178,6 @@ function common_ensure_session()
}
if (isset($id)) {
session_id($id);
setcookie(session_name(), $id);
}
@session_start();
if (!isset($_SESSION['started'])) {
@@ -990,10 +989,16 @@ function common_enqueue_notice($notice)
static $localTransports = array('omb',
'ping');
static $allTransports = array('sms', 'plugin');
$transports = $allTransports;
$transports = array();
if (common_config('sms', 'enabled')) {
$transports[] = 'sms';
}
if (Event::hasHandler('HandleQueuedNotice')) {
$transports[] = 'plugin';
}
// @fixme move these checks into QueueManager and/or individual handlers
if ($notice->is_local == Notice::LOCAL_PUBLIC ||
$notice->is_local == Notice::LOCAL_NONPUBLIC) {
$transports = array_merge($transports, $localTransports);