From 13c76efcef1bff974dfb8e1aa9cadadaeb2ee6d6 Mon Sep 17 00:00:00 2001
From: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
Date: Thu, 7 Mar 2024 14:53:00 +0900
Subject: [PATCH] Fix new layout path location

Was "www/layout/admin|frontend/..." now is
www/frontend/layout and www/admin/layout
---
 www/admin/class_test.image.php    | 8 ++++----
 www/lib/CoreLibs/Output/Image.php | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/www/admin/class_test.image.php b/www/admin/class_test.image.php
index 0ae756ba..21e8ee71 100644
--- a/www/admin/class_test.image.php
+++ b/www/admin/class_test.image.php
@@ -41,9 +41,9 @@ print '<div><h1>' . $PAGE_NAME . '</h1></div>';
 $thumb_width = 250;
 $thumb_height = 300;
 // class
-$image = BASE . LAYOUT . CONTENT_PATH . IMAGES . 'no_picture_square.jpg';
+$image = BASE . CONTENT_PATH . LAYOUT . IMAGES . 'no_picture_square.jpg';
 // folders
-$cache_folder = BASE . LAYOUT . CONTENT_PATH . CACHE . IMAGES;
+$cache_folder = BASE . CONTENT_PATH . LAYOUT . CACHE . IMAGES;
 $web_folder = LAYOUT . CACHE . IMAGES;
 // rotate image first
 try {
@@ -58,7 +58,7 @@ echo "<div>CLASS->CREATETHUMBNAILSIMPLE: "
 	. basename($image) . ": WIDTH: $thumb_width<br><img src="
 	. $_image->createThumbnailSimple($image, $thumb_width, 0, $cache_folder, $web_folder) . "></div>";
 // static
-$image = BASE . LAYOUT . CONTENT_PATH . IMAGES . 'no_picture.jpg';
+$image = BASE . CONTENT_PATH . LAYOUT . IMAGES . 'no_picture.jpg';
 // rotate image first
 try {
 	$image_class::correctImageOrientation($image);
@@ -94,7 +94,7 @@ $images = array(
 // return mime type ala mimetype
 $finfo = new finfo(FILEINFO_MIME_TYPE);
 foreach ($images as $image) {
-	$image = BASE . LAYOUT . CONTENT_PATH . IMAGES . $image;
+	$image = BASE . CONTENT_PATH . LAYOUT . IMAGES . $image;
 	list ($height, $width, $img_type) = \CoreLibs\Convert\SetVarType::setArray(getimagesize($image));
 	echo "<div><b>IMAGE INFO</b>: " . $height . "x" . $width . ", TYPE: "
 		. \CoreLibs\Debug\Support::dumpVar($img_type) . " [" . $finfo->file($image) . "]</div>";
diff --git a/www/lib/CoreLibs/Output/Image.php b/www/lib/CoreLibs/Output/Image.php
index 4114494e..9fd82619 100644
--- a/www/lib/CoreLibs/Output/Image.php
+++ b/www/lib/CoreLibs/Output/Image.php
@@ -204,11 +204,11 @@ class Image
 				E_USER_DEPRECATED
 			);
 			// NOTE: we need to depracte this
-			$cache_folder = BASE . LAYOUT . CONTENT_PATH . CACHE . IMAGES;
+			$cache_folder = BASE . CONTENT_PATH . LAYOUT . CACHE . IMAGES;
 			$web_folder = LAYOUT . CACHE . IMAGES;
 			if (!is_dir($cache_folder)) {
 				if (false === mkdir($cache_folder)) {
-					$cache_folder = BASE . LAYOUT . CONTENT_PATH . CACHE;
+					$cache_folder = BASE . CONTENT_PATH . LAYOUT . CACHE;
 					$web_folder = LAYOUT . CACHE;
 				}
 			}