diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-21 20:51:07 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-21 20:51:07 -0700 |
| commit | ae6612025dcd31349056364d0c701bfda58470db (patch) | |
| tree | c67db564af1d2368344205fda2889f336dd14925 /include/RedDAV | |
| parent | 33c9d8e06b2af512d25b0c9063ce58d86b72f747 (diff) | |
| parent | 0ad71b3efa7de4eb1f4313ffe4562ec83743bdc1 (diff) | |
| download | volse-hubzilla-ae6612025dcd31349056364d0c701bfda58470db.tar.gz volse-hubzilla-ae6612025dcd31349056364d0c701bfda58470db.tar.bz2 volse-hubzilla-ae6612025dcd31349056364d0c701bfda58470db.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
util/messages.po
Diffstat (limited to 'include/RedDAV')
| -rw-r--r-- | include/RedDAV/RedBrowser.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php index a0330d7cc..d74bba220 100644 --- a/include/RedDAV/RedBrowser.php +++ b/include/RedDAV/RedBrowser.php @@ -247,7 +247,7 @@ class RedBrowser extends DAV\Browser\Plugin { $this->server->broadcastEvent('onHTMLActionsPanel', array($parent, &$output)); } - $html .= replace_macros(get_markup_template('cloud_header.tpl'), array( + $html .= replace_macros(get_markup_template('cloud.tpl'), array( '$header' => t('Files') . ": " . $this->escapeHTML($path) . "/", '$quota' => $quota, '$total' => t('Total'), @@ -255,10 +255,7 @@ class RedBrowser extends DAV\Browser\Plugin { '$shared' => t('Shared'), '$create' => t('Create'), '$upload' => t('Upload'), - '$is_owner' => $is_owner - )); - - $html .= replace_macros(get_markup_template('cloud_directory.tpl'), array( + '$is_owner' => $is_owner, '$parentpath' => $parentpath, '$entries' => $f, '$name' => t('Name'), |