Merge pull request #333 from nextcloud/sync-master

Sync master

6 files changed, 16 insertions, 27 deletions

diff --git a/lib/base.php b/lib/base.php
index dde8e38218a..70fac6d707b 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -49,8 +49,6 @@
  *
  */
 
-use OCP\IRequest;
-
 require_once 'public/Constants.php';
 
 /**
@@ -273,20 +271,9 @@ class OC {
 		}
 	}
 
-	/**
-	 * Limit maintenance mode access
-	 * @param IRequest $request
-	 */
-	public static function checkMaintenanceMode(IRequest $request) {
-		// Check if requested URL matches 'index.php/occ'
-		$isOccControllerRequested = preg_match('|/index\.php$|', $request->getScriptName()) === 1
-				&& strpos($request->getPathInfo(), '/occ/') === 0;
+	public static function checkMaintenanceMode() {
 		// Allow ajax update script to execute without being stopped
-		if (
-			\OC::$server->getSystemConfig()->getValue('maintenance', false)
-			&& OC::$SUBURI != '/core/ajax/update.php'
-			&& !$isOccControllerRequested
-		) {
+		if (\OC::$server->getSystemConfig()->getValue('maintenance', false) && OC::$SUBURI != '/core/ajax/update.php') {
 			// send http status 503
 			header('HTTP/1.1 503 Service Temporarily Unavailable');
 			header('Status: 503 Service Temporarily Unavailable');
@@ -835,7 +822,7 @@ class OC {
 		$request = \OC::$server->getRequest();
 		$requestPath = $request->getRawPathInfo();
 		if (substr($requestPath, -3) !== '.js') { // we need these files during the upgrade
-			self::checkMaintenanceMode($request);
+			self::checkMaintenanceMode();
 			self::checkUpgrade();
 		}
 
diff --git a/lib/private/Console/Application.php b/lib/private/Console/Application.php
index 8a9191a4c53..ec91064278e 100644
--- a/lib/private/Console/Application.php
+++ b/lib/private/Console/Application.php
@@ -138,10 +138,9 @@ class Application {
 	 * @throws \Exception
 	 */
 	public function run(InputInterface $input = null, OutputInterface $output = null) {
-		$args = isset($this->request->server['argv']) ? $this->request->server['argv'] : [];
 		$this->dispatcher->dispatch(ConsoleEvent::EVENT_RUN, new ConsoleEvent(
 			ConsoleEvent::EVENT_RUN,
-			$args
+			$this->request->server['argv']
 		));
 		return $this->application->run($input, $output);
 	}
diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php
index 6191eae2754..2d68c92b14e 100644
--- a/lib/private/Files/Type/Detection.php
+++ b/lib/private/Files/Type/Detection.php
@@ -283,21 +283,21 @@ class Detection implements IMimeTypeDetector {
 
 		// Is it a dir?
 		if ($mimetype === 'dir') {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder.png');
+			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder.svg');
 			return $this->mimetypeIcons[$mimetype];
 		}
 		if ($mimetype === 'dir-shared') {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder-shared.png');
+			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder-shared.svg');
 			return $this->mimetypeIcons[$mimetype];
 		}
 		if ($mimetype === 'dir-external') {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder-external.png');
+			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder-external.svg');
 			return $this->mimetypeIcons[$mimetype];
 		}
 
 		// Icon exists?
 		try {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $icon . '.png');
+			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $icon . '.svg');
 			return $this->mimetypeIcons[$mimetype];
 		} catch (\RuntimeException $e) {
 			// Specified image not found
@@ -306,13 +306,13 @@ class Detection implements IMimeTypeDetector {
 		// Try only the first part of the filetype
 		$mimePart = substr($icon, 0, strpos($icon, '-'));
 		try {
-			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $mimePart . '.png');
+			$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/' . $mimePart . '.svg');
 			return $this->mimetypeIcons[$mimetype];
 		} catch (\RuntimeException $e) {
 			// Image for the first part of the mimetype not found
 		}
 
-		$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/file.png');
+		$this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/file.svg');
 		return $this->mimetypeIcons[$mimetype];
 	}
 }
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 31549c93cb2..7d9771e6394 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -1980,7 +1980,7 @@ class View {
 		$mount = $this->getMountForLock($absolutePath, $lockMountPoint);
 		if ($mount) {
 			$storage = $mount->getStorage();
-			if ($storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
+			if ($storage && $storage->instanceOfStorage('\OCP\Files\Storage\ILockingStorage')) {
 				$storage->releaseLock(
 					$mount->getInternalPath($absolutePath),
 					$type,
diff --git a/lib/private/Preview/MP3.php b/lib/private/Preview/MP3.php
index 8b1a0500538..f96b422f57a 100644
--- a/lib/private/Preview/MP3.php
+++ b/lib/private/Preview/MP3.php
@@ -68,7 +68,7 @@ class MP3 extends Provider {
 	 * @return bool|\OCP\IImage false if the default image is missing or invalid
 	 */
 	private function getNoCoverThumbnail() {
-		$icon = \OC::$SERVERROOT . '/core/img/filetypes/audio.png';
+		$icon = \OC::$SERVERROOT . '/core/img/filetypes/audio.svg';
 
 		if(!file_exists($icon)) {
 			return false;
diff --git a/lib/private/SystemTag/SystemTagManager.php b/lib/private/SystemTag/SystemTagManager.php
index 3e32582025f..7055fafbf24 100644
--- a/lib/private/SystemTag/SystemTagManager.php
+++ b/lib/private/SystemTag/SystemTagManager.php
@@ -140,7 +140,10 @@ class SystemTagManager implements ISystemTagManager {
 
 		if (!empty($nameSearchPattern)) {
 			$query->andWhere(
-				$query->expr()->like('name', $query->createNamedParameter('%' . $this->connection->escapeLikeParameter($nameSearchPattern) . '%'))
+				$query->expr()->like(
+					'name',
+					$query->createNamedParameter('%' . $this->connection->escapeLikeParameter($nameSearchPattern). '%')
+				)
 			);
 		}