Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 3 insertions, 3 deletions

diff --git a/mod/removeaccount.php b/mod/removeaccount.php
index 18aaa2517..f3fa53f75 100644
--- a/mod/removeaccount.php
+++ b/mod/removeaccount.php
@@ -5,7 +5,7 @@ function removeaccount_post(&$a) {
 	if(! local_channel())
 		return;
 
-	if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
+	if($_SESSION['delegate'])
 		return;
 
 	if((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password']))))
@@ -55,7 +55,7 @@ function removeaccount_content(&$a) {
 		'$basedir' => $a->get_baseurl(),
 		'$hash' => $hash,
 		'$title' => t('Remove This Account'),
-		'$desc' => t('This will completely remove this account including all its channels from the network. Once this has been done it is not recoverable.'),
+		'$desc' => array(t('WARNING: '), t('This account and all its channels will be completely removed from the network. '), t('This action is permanent and can not be undone!')),
 		'$passwd' => t('Please enter your password for verification:'),
 		'$global' => array('global', t('Remove this account, all its channels and all its channel clones from the network'), false, t('By default only the instances of the channels located on this hub will be removed from the network')),
 		'$submit' => t('Remove Account')
@@ -63,4 +63,4 @@ function removeaccount_content(&$a) {
 
 	return $o;		
 
-}
\ No newline at end of file
+}