Merge remote-tracking branch 'upstream/dev' into website-import

2016-07-17 11:54:36 -04:00
parent 6c5086a933 2b674d4cd9
commit 75fb065526
5 changed files with 48 additions and 21 deletions
--- a/Zotlabs/Module/Embedphotos.php
+++ b/Zotlabs/Module/Embedphotos.php
@@ -159,7 +159,7 @@ function embedphotos_widget_album($args) {
 			'$upload' => array(t('Upload'), z_root() . '/photos/' . \App::$profile['channel_address'] . '/upload/' . bin2hex($album)),
 			'$order' => false,
 			'$upload_form' => $upload_form,
-			'$usage' => $usage_message
+			'$no_fullscreen_btn' => true
 		));

 		return $o;