aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Storage
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-12-04 14:28:00 -0800
committerzotlabs <mike@macgirvin.com>2017-12-04 14:28:00 -0800
commit0a55d6d51143acbf1084104d1626c7a4b88e6c15 (patch)
treec2fc3c5a117f5256aac76dce94cf6dd202df2171 /Zotlabs/Storage
parent95311ad07e08c01ff8b9d865cbbc2a0b2bae5239 (diff)
parent0305983360568f991365cd815d081afedaa6d742 (diff)
downloadvolse-hubzilla-0a55d6d51143acbf1084104d1626c7a4b88e6c15.tar.gz
volse-hubzilla-0a55d6d51143acbf1084104d1626c7a4b88e6c15.tar.bz2
volse-hubzilla-0a55d6d51143acbf1084104d1626c7a4b88e6c15.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Storage')
-rw-r--r--Zotlabs/Storage/Browser.php3
1 files changed, 0 insertions, 3 deletions
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
index dd3067cf8..26abf27b5 100644
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -373,8 +373,6 @@ class Browser extends DAV\Browser\Plugin {
if(strpos($path,$special) === 0)
$path = trim(substr($path,$count),'/');
- $info = t('Please use DAV to upload large (video, audio) files.<br>See <a class="zrl" href="help/member/member_guide#Cloud_Desktop_Clients">Cloud Desktop Clients</a>');
-
$output .= replace_macros(get_markup_template('cloud_actionspanel.tpl'), array(
'$folder_header' => t('Create new folder'),
@@ -382,7 +380,6 @@ class Browser extends DAV\Browser\Plugin {
'$upload_header' => t('Upload file'),
'$upload_submit' => t('Upload'),
'$quota' => $quota,
- '$info' => $info,
'$channick' => $this->auth->owner_nick,
'$aclselect' => $aclselect,
'$allow_cid' => acl2json($channel_acl['allow_cid']),