[Pkg-owncloud-commits] [php-sabredav] 77/275: Merge branch '2.0'

Thu Sep 25 14:55:54 UTC 2014

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit 8ea3ce852c3340018b296ad8d854c1b0fe825e3e
Merge: d2a5a13 c64d8d9
Author: Evert Pot <me at evertpot.com>
Date:   Wed Jul 2 12:20:54 2014 -0400

    Merge branch '2.0'

 ChangeLog.md                           |  4 +++-
 lib/DAV/Browser/Plugin.php             | 16 ++++++++--------
 tests/Sabre/DAV/Browser/PluginTest.php |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --cc lib/DAV/Browser/Plugin.php
index 12296f1,31d6005..9af7533

--- a/lib/DAV/Browser/Plugin.php
+++ b/lib/DAV/Browser/Plugin.php
@@@ -195,12 -195,12 +195,12 @@@ class Plugin extends DAV\ServerPlugin 
  
          $vars = [
              'path'      => $this->escapeHTML($path),
-             'favicon'   => $this->getAssetUrl('favicon.ico'),
-             'style'     => $this->getAssetUrl('sabredav.css'),
-             'iconstyle' => $this->getAssetUrl('openiconic/open-iconic.css'),
-             'logo'      => $this->getAssetUrl('sabredav.png'),
+             'favicon'   => $this->escapeHTML($this->getAssetUrl('favicon.ico')),
+             'style'     => $this->escapeHTML($this->getAssetUrl('sabredav.css')),
+             'iconstyle' => $this->escapeHTML($this->getAssetUrl('openiconic/open-iconic.css')),
+             'logo'      => $this->escapeHTML($this->getAssetUrl('sabredav.png')),
              'baseUrl'   => $this->server->getBaseUri(),
 -       ];
 +        ];
  
          $html = <<<HTML
  <!DOCTYPE html>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git

