Merge https://github.com/friendica/red into pending_merge

2014-12-15 14:37:57 -08:00
parent f28103d595 3b343f8f6c
commit 2e990743e7
12 changed files with 1261 additions and 1213 deletions
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -500,15 +500,10 @@ function widget_settings_menu($arr) {

 		array(
 			'label' => t('Export channel'),
-			'url' => $a->get_baseurl(true) . '/uexport/basic',
+			'url' => $a->get_baseurl(true) . '/uexport',
 			'selected' => ''
 		),

-		array(
-			'label' => t('Export content'),
-			'url' => $a->get_baseurl(true) . '/uexport/complete',
-			'selected' => ''
-		),
 	);

 	if($role === false || $role === 'custom') {