mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #18095 from nextcloud/enh/svg-settings-app 

Remove exception for settings app from svg controller
This commit is contained in:
Roeland Jago Douma 2019-11-25 08:37:09 +01:00 committed by GitHub
parent 3c17d1b5e2 957c0df01b
commit e4fe1fcc12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/Controller/SvgController.php
View File

@ -90,12 +90,6 @@ class SvgController extends Controller {
* @return DataDisplayResponse|NotFoundResponse * @return DataDisplayResponse|NotFoundResponse
*/ */
public function getSvgFromApp(string $app, string $fileName, string $color = 'ffffff') { public function getSvgFromApp(string $app, string $fileName, string $color = 'ffffff') {
if ($app === 'settings') {
$path = $this->serverRoot . "/settings/img/$fileName.svg";
return $this->getSvg($path, $color, $fileName);
}
$appRootPath = $this->appManager->getAppPath($app); $appRootPath = $this->appManager->getAppPath($app);
$appPath = substr($appRootPath, strlen($this->serverRoot)); $appPath = substr($appRootPath, strlen($this->serverRoot));