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, 4 insertions, 4 deletions

diff --git a/mod/removeme.php b/mod/removeme.php
index 492738b77..b604bc7db 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -5,7 +5,7 @@ function removeme_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,12 +55,12 @@ function removeme_content(&$a) {
 		'$basedir' => $a->get_baseurl(),
 		'$hash' => $hash,
 		'$title' => t('Remove This Channel'),
-		'$desc' => t('This will completely remove this channel from the network. Once this has been done it is not recoverable.'),
+		'$desc' => array(t('WARNING: '), t('This channel 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 channel and all its clones from the network'), false, t('By default only the instance of the channel located on this hub will be removed from the network')),
+		'$global' => array('global', t('Remove this channel and all its clones from the network'), false, t('By default only the instance of the channel located on this hub will be removed from the network'), array(t('No'),t('Yes'))),
 		'$submit' => t('Remove Channel')
 	));
 
 	return $o;		
 
-}
\ No newline at end of file
+}