Merge pull request #12891 from nextcloud/theming-caching

more caching for theming

1 files changed, 13 insertions, 2 deletions

diff --git a/lib/private/Template/IconsCacher.php b/lib/private/Template/IconsCacher.php
index aab3295405d..0d838c4d06d 100644
--- a/lib/private/Template/IconsCacher.php
+++ b/lib/private/Template/IconsCacher.php
@@ -58,6 +58,9 @@ class IconsCacher {
 
 	private $iconList = 'icons-list.template';
 
+	private $cachedCss;
+	private $cachedList;
+
 	/**
 	 * @param ILogger $logger
 	 * @param Factory $appDataFactory
@@ -137,6 +140,8 @@ class IconsCacher {
 			$cachedVarsCssFile->putContent($data);
 			$list = ":root {\n$list\n}";
 			$cachedFile->putContent($list);
+			$this->cachedList = null;
+			$this->cachedCss = null;
 		}
 
 		return preg_replace($this->iconVarRE, '', $css);
@@ -204,7 +209,10 @@ class IconsCacher {
 	 */
 	public function getCachedCSS() {
 		try {
-			return $this->folder->getFile($this->fileName);
+			if (!$this->cachedCss) {
+				$this->cachedCss = $this->folder->getFile($this->fileName);
+			}
+			return $this->cachedCss;
 		} catch (NotFoundException $e) {
 			return false;
 		}
@@ -216,7 +224,10 @@ class IconsCacher {
 	 */
 	public function getCachedList() {
 		try {
-			return $this->folder->getFile($this->iconList);
+			if (!$this->cachedList) {
+				$this->cachedList = $this->folder->getFile($this->iconList);
+			}
+			return $this->cachedList;
 		} catch (NotFoundException $e) {
 			return false;
 		}