diff --git a/administrator/components/com_templates/src/Model/TemplateModel.php b/administrator/components/com_templates/src/Model/TemplateModel.php
index 3c7791f6e1102..9d8912ba85ca4 100644
--- a/administrator/components/com_templates/src/Model/TemplateModel.php
+++ b/administrator/components/com_templates/src/Model/TemplateModel.php
@@ -76,8 +76,8 @@ protected function getFile($path, $name)
 
 		if ($this->getTemplate())
 		{
-			$path = str_replace(JPATH_ROOT . DIRECTORY_SEPARATOR . 'media' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . ($this->template->client_id === 0 ? 'site' : 'administrator') . DIRECTORY_SEPARATOR . $this->template->element, '', $path);
-			$path = str_replace(JPATH_ROOT . DIRECTORY_SEPARATOR . ($this->template->client_id === 0 ? '' : 'administrator' . DIRECTORY_SEPARATOR) . 'templates' . DIRECTORY_SEPARATOR . $this->template->element, '', $path);
+			$path = str_replace(JPATH_ROOT . DIRECTORY_SEPARATOR . 'media' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . ((int) $this->template->client_id === 0 ? 'site' : 'administrator') . DIRECTORY_SEPARATOR . $this->template->element, '', $path);
+			$path = str_replace(JPATH_ROOT . DIRECTORY_SEPARATOR . ((int) $this->template->client_id === 0 ? '' : 'administrator' . DIRECTORY_SEPARATOR) . 'templates' . DIRECTORY_SEPARATOR . $this->template->element, '', $path);
 			$temp->name = $name;
 			$temp->id = urlencode(base64_encode(str_replace('\\', '//', $path)));
 
@@ -450,8 +450,8 @@ public function getDirectoryTree($dir)
 			{
 				if (is_dir($dir . $value))
 				{
-					$relativePath = str_replace(JPATH_ROOT . DIRECTORY_SEPARATOR . 'media' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . ($this->template->client_id === 0 ? 'site' : 'administrator') . DIRECTORY_SEPARATOR . $this->template->element, '', $dir . $value);
-					$relativePath = str_replace(JPATH_ROOT . DIRECTORY_SEPARATOR . ($this->template->client_id === 0 ? '' : 'administrator' . DIRECTORY_SEPARATOR) .'templates' . DIRECTORY_SEPARATOR . $this->template->element, '', $relativePath);
+					$relativePath = str_replace(JPATH_ROOT . DIRECTORY_SEPARATOR . 'media' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . ((int) $this->template->client_id === 0 ? 'site' : 'administrator') . DIRECTORY_SEPARATOR . $this->template->element, '', $dir . $value);
+					$relativePath = str_replace(JPATH_ROOT . DIRECTORY_SEPARATOR . ((int) $this->template->client_id === 0 ? '' : 'administrator' . DIRECTORY_SEPARATOR) .'templates' . DIRECTORY_SEPARATOR . $this->template->element, '', $relativePath);
 					$result[str_replace('\\', '//', $relativePath)] = $this->getDirectoryTree($dir . $value . '/');
 				}
 				else
@@ -461,8 +461,8 @@ public function getDirectoryTree($dir)
 
 					if ($allowedFormat == true)
 					{
-						$relativePath = str_replace(JPATH_ROOT . DIRECTORY_SEPARATOR . 'media'. DIRECTORY_SEPARATOR . 'templates'  . DIRECTORY_SEPARATOR . ($this->template->client_id === 0 ? 'site' : 'administrator') . DIRECTORY_SEPARATOR . $this->template->element, '', $dir . $value);
-						$relativePath = str_replace(JPATH_ROOT . DIRECTORY_SEPARATOR . ($this->template->client_id === 0 ? '' : 'administrator' . DIRECTORY_SEPARATOR) . 'templates' . DIRECTORY_SEPARATOR . $this->template->element, '', $relativePath);
+						$relativePath = str_replace(JPATH_ROOT . DIRECTORY_SEPARATOR . 'media'. DIRECTORY_SEPARATOR . 'templates'  . DIRECTORY_SEPARATOR . ((int) $this->template->client_id === 0 ? 'site' : 'administrator') . DIRECTORY_SEPARATOR . $this->template->element, '', $dir . $value);
+						$relativePath = str_replace(JPATH_ROOT . DIRECTORY_SEPARATOR . ((int) $this->template->client_id === 0 ? '' : 'administrator' . DIRECTORY_SEPARATOR) . 'templates' . DIRECTORY_SEPARATOR . $this->template->element, '', $relativePath);
 						$result[] = $this->getFile($relativePath, $value);
 					}
 				}
@@ -683,7 +683,7 @@ public function &getTemplate()
 
 				if (!isset($this->template->xmldata))
 				{
-					$this->template->xmldata = TemplatesHelper::parseXMLTemplateFile($this->template->client_id === 0 ? JPATH_ROOT : JPATH_ROOT . '/administrator', $this->template->name);
+					$this->template->xmldata = TemplatesHelper::parseXMLTemplateFile((int) $this->template->client_id === 0 ? JPATH_ROOT : JPATH_ROOT . '/administrator', $this->template->name);
 				}
 			}
 		}
@@ -952,8 +952,8 @@ public function &getSource()
 			$fileName = str_replace('//', '/', $fileName);
 			$isMedia  = $input->getInt('isMedia', 0);
 
-			$fileName = $isMedia ? Path::clean(JPATH_ROOT . '/media/templates/' . ($this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element . $fileName)
-			: Path::clean(JPATH_ROOT . ($this->template->client_id === 0 ? '' : '/administrator') . '/templates/' . $this->template->element . $fileName);
+			$fileName = $isMedia ? Path::clean(JPATH_ROOT . '/media/templates/' . ((int) $this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element . $fileName)
+			: Path::clean(JPATH_ROOT . ((int) $this->template->client_id === 0 ? '' : '/administrator') . '/templates/' . $this->template->element . $fileName);
 
 			try
 			{
@@ -973,9 +973,9 @@ public function &getSource()
 				$item->source       = file_get_contents($filePath);
 				$item->filePath     = Path::clean($filePath);
 				$ds                 = DIRECTORY_SEPARATOR;
-				$cleanFileName      = str_replace(JPATH_ROOT . ($this->template->client_id === 1 ? $ds . 'administrator' . $ds : $ds) . 'templates' . $ds . $this->template->element, '', $fileName);
+				$cleanFileName      = str_replace(JPATH_ROOT . ((int) $this->template->client_id === 1 ? $ds . 'administrator' . $ds : $ds) . 'templates' . $ds . $this->template->element, '', $fileName);
 
-				if ($coreFile = $this->getCoreFile($cleanFileName, $this->template->client_id))
+				if ($coreFile = $this->getCoreFile($cleanFileName, (int) $this->template->client_id))
 				{
 					$item->coreFile = $coreFile;
 					$item->core = file_get_contents($coreFile);
@@ -1012,8 +1012,8 @@ public function save($data)
 		$app      = Factory::getApplication();
 		$fileName = base64_decode($app->input->get('file'));
 		$isMedia  = $app->input->getInt('isMedia', 0);
-		$fileName = $isMedia ? JPATH_ROOT . '/media/templates/' . ($this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element . $fileName  :
-			JPATH_ROOT . '/' . ($this->template->client_id === 0 ? '' : 'administrator/') . 'templates/' . $this->template->element . $fileName;
+		$fileName = $isMedia ? JPATH_ROOT . '/media/templates/' . ((int) $this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element . $fileName  :
+			JPATH_ROOT . '/' . ((int) $this->template->client_id === 0 ? '' : 'administrator/') . 'templates/' . $this->template->element . $fileName;
 
 		$filePath = Path::clean($fileName);
 
@@ -2005,7 +2005,7 @@ public function getMediaFiles()
 
 		if (!isset($template->xmldata))
 		{
-			$template->xmldata = TemplatesHelper::parseXMLTemplateFile($template->client_id === 0 ? JPATH_ROOT : JPATH_ROOT . '/administrator', $template->name);
+			$template->xmldata = TemplatesHelper::parseXMLTemplateFile((int) $template->client_id === 0 ? JPATH_ROOT : JPATH_ROOT . '/administrator', $template->name);
 		}
 
 		if (!isset($template->xmldata->inheritable) || (isset($template->xmldata->parent) && $template->xmldata->parent === ''))
@@ -2014,7 +2014,7 @@ public function getMediaFiles()
 		}
 
 		$app  = Factory::getApplication();
-		$path = Path::clean(JPATH_ROOT . '/media/templates/' . ($template->client_id === 0 ? 'site' : 'administrator') . '/' . $template->element . '/');
+		$path = Path::clean(JPATH_ROOT . '/media/templates/' . ((int) $template->client_id === 0 ? 'site' : 'administrator') . '/' . $template->element . '/');
 		$this->mediaElement = $path;
 
 		if (!is_writable($path))
@@ -2042,8 +2042,8 @@ private function getBasePath()
 		$app      = Factory::getApplication();
 		$isMedia  = $app->input->getInt('isMedia', 0);
 
-		return $isMedia ? JPATH_ROOT . '/media/templates/' . ($this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element :
-			JPATH_ROOT . '/' . ($this->template->client_id === 0 ? '' : 'administrator/') . 'templates/' . $this->template->element;
+		return $isMedia ? JPATH_ROOT . '/media/templates/' . ((int) $this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element :
+			JPATH_ROOT . '/' . ((int) $this->template->client_id === 0 ? '' : 'administrator/') . 'templates/' . $this->template->element;
 	}
 
 	/**
@@ -2165,7 +2165,7 @@ public function child()
 		// Media folder
 		$media = $xml->addChild('media');
 		$media->addAttribute('folder', 'media');
-		$media->addAttribute('destination', 'templates/' . ($template->client_id === 0 ? 'site/' : 'administrator/') . $template->element . '_' . $newName);
+		$media->addAttribute('destination', 'templates/' . ((int) $template->client_id === 0 ? 'site/' : 'administrator/') . $template->element . '_' . $newName);
 		$media->addChild('folder', 'css');
 		$media->addChild('folder', 'js');
 		$media->addChild('folder', 'images');
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index 0ba743291ea4f..bd9ce8072bf02 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -64,7 +64,7 @@
 	<div class="row mt-2">
 		<div class="col-md-8" id="conditional-section">
 			<?php if ($this->type == 'file') : ?>
-				<p class="lead"><?php echo Text::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', '&#x200E;' . ($input->get('isMedia', 0) ? '/media/templates/' . ($this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element . str_replace('//', '/', base64_decode($this->file)) : '/' . ($this->template->client_id === 0 ? '' : 'administrator/') . 'templates/' . $this->template->element . str_replace('//', '/', base64_decode($this->file))), $this->template->element); ?></p>
+				<p class="lead"><?php echo Text::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', '&#x200E;' . ($input->get('isMedia', 0) ? '/media/templates/' . ((int) $this->template->client_id === 0 ? 'site' : 'administrator') . '/' . $this->template->element . str_replace('//', '/', base64_decode($this->file)) : '/' . ((int) $this->template->client_id === 0 ? '' : 'administrator/') . 'templates/' . $this->template->element . str_replace('//', '/', base64_decode($this->file))), $this->template->element); ?></p>
 				<p class="lead path hidden"><?php echo $this->source->filename; ?></p>
 			<?php endif; ?>
 			<?php if ($this->type == 'image') : ?>
@@ -92,7 +92,7 @@
 					<li class="folder-select">
 						<a class="folder-url" data-id="" href="">
 							<span class="icon-folder icon-fw" aria-hidden="true"></span>
-							<?php echo ($this->template->client_id === 0 ? '/' : '/administrator/') . 'templates/' . $this->template->element; ?>
+							<?php echo ((int) $this->template->client_id === 0 ? '/' : '/administrator/') . 'templates/' . $this->template->element; ?>
 						</a>
 						<?php echo $this->loadTemplate('tree'); ?>
 					</li>
@@ -102,7 +102,7 @@
 						<li class="folder-select">
 							<a class="folder-url" data-id="" href="">
 								<span class="icon-folder icon-fw" aria-hidden="true"></span>
-								<?php echo '/media/templates/' . ($this->template->client_id === 0 ? 'site/' : 'administrator/') . $this->template->element; ?>
+								<?php echo '/media/templates/' . ((int) $this->template->client_id === 0 ? 'site/' : 'administrator/') . $this->template->element; ?>
 							</a>
 							<?php echo $this->loadTemplate('tree_media'); ?>
 						</li>
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_file_body.php b/administrator/components/com_templates/tmpl/template/default_modal_file_body.php
index d3dbea84b4f32..270df5bc1abb5 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_file_body.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_file_body.php
@@ -27,7 +27,7 @@
 						<li class="folder-select">
 							<a class="folder-url" data-id="" href="" data-base="template">
 								<span class="icon-folder icon-fw" aria-hidden="true"></span>
-								<?php echo ($this->template->client_id === 0 ? '/' : '/administrator/') . 'templates/' . $this->template->element; ?>
+								<?php echo ((int) $this->template->client_id === 0 ? '/' : '/administrator/') . 'templates/' . $this->template->element; ?>
 							</a>
 							<?php echo $this->loadTemplate('folders'); ?>
 						</li>
@@ -37,7 +37,7 @@
 							<li class="folder-select">
 								<a class="folder-url" data-id="" href="" data-base="media">
 									<span class="icon-folder icon-fw" aria-hidden="true"></span>
-									<?php echo '/media/templates/' . ($this->template->client_id === 0 ? 'site/' : 'administrator/') . $this->template->element; ?>
+									<?php echo '/media/templates/' . ((int) $this->template->client_id === 0 ? 'site/' : 'administrator/') . $this->template->element; ?>
 								</a>
 								<?php echo $this->loadTemplate('media_folders'); ?>
 							</li>
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_folder_body.php b/administrator/components/com_templates/tmpl/template/default_modal_folder_body.php
index ffaf89efe0a4b..1be7dd5f6e8c7 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_folder_body.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_folder_body.php
@@ -26,7 +26,7 @@
 						<li class="folder-select">
 							<a class="folder-url" data-id="" href="" data-base="template">
 								<span class="icon-folder icon-fw" aria-hidden="true"></span>
-								<?php echo ($this->template->client_id === 0 ? '/' : '/administrator/') . 'templates/' . $this->template->element; ?>
+								<?php echo ((int) $this->template->client_id === 0 ? '/' : '/administrator/') . 'templates/' . $this->template->element; ?>
 							</a>
 							<?php echo $this->loadTemplate('folders'); ?>
 						</li>
@@ -36,7 +36,7 @@
 							<li class="folder-select">
 								<a class="folder-url" data-id="" href="" data-base="media">
 									<span class="icon-folder icon-fw" aria-hidden="true"></span>
-									<?php echo '/media/templates/' . ($this->template->client_id === 0 ? 'site/' : 'administrator/') . $this->template->element; ?>
+									<?php echo '/media/templates/' . ((int) $this->template->client_id === 0 ? 'site/' : 'administrator/') . $this->template->element; ?>
 								</a>
 								<?php echo $this->loadTemplate('media_folders'); ?>
 							</li>