Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/bookmarks.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2016-06-12 12:25:02 +0300
committerGitHub <noreply@github.com>2016-06-12 12:25:02 +0300
commit42947ca1e4b56a360e1c5a9b76810248d529e764 (patch)
treecbb1eacba98e3d605e614b71338805b95a6b4aa4
parent340afcc04990631f5ff80a853acd43cf40f9d70b (diff)
parent720d808dc1a0ab049029091a98b08a0408872f68 (diff)
Merge pull request #146 from MrksKwsnck/masterv9.1.0RC4v9.1.0RC3v9.1.0RC2v9.1.0RC1v9.1.0
Exporting bookmarks results in PHP fatal error
-rw-r--r--controller/rest/bookmarkcontroller.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/controller/rest/bookmarkcontroller.php b/controller/rest/bookmarkcontroller.php
index 2506e5a6..af08907b 100644
--- a/controller/rest/bookmarkcontroller.php
+++ b/controller/rest/bookmarkcontroller.php
@@ -19,6 +19,7 @@ use \OCP\AppFramework\Http;
use \OCP\IDb;
use \OCA\Bookmarks\Controller\Lib\Bookmarks;
use \OCA\Bookmarks\Controller\Lib\ExportResponse;
+use \OCA\Bookmarks\Controller\Lib\Helper;
class BookmarkController extends ApiController {
@@ -263,7 +264,7 @@ EOT;
$title = $bm['title'];
if (trim($title) === '') {
$url_parts = parse_url($bm['url']);
- $title = isset($url_parts['host']) ? OCA\Bookmarks\Controller\Lib\Helper::getDomainWithoutExt($url_parts['host']) : $bm['url'];
+ $title = isset($url_parts['host']) ? Helper::getDomainWithoutExt($url_parts['host']) : $bm['url'];
}
$file .= '<DT><A HREF="' . \OC_Util::sanitizeHTML($bm['url']) . '" TAGS="' . implode(',', \OC_Util::sanitizeHTML($bm['tags'])) . '">';
$file .= htmlspecialchars($title, ENT_QUOTES, 'UTF-8') . '</A>';