Always convert the old tl_files path

system/modules/core/classes/Theme.php

@@ -517,7 +517,7 @@ protected function extractThemeFiles($arrFiles, $arrDbFields)
 						}
 
 						// Adjust the file paths in style sheets
-						elseif (\Config::get('uploadPath') != 'files' && ($table == 'tl_style_sheet' || $table == 'tl_style') && strpos($value, 'files') !== false)
+						elseif (($table == 'tl_style_sheet' || $table == 'tl_style') && strpos($value, 'files') !== false)
 						{
 							$tmp = deserialize($value);
 
@@ -979,7 +979,7 @@ protected function addDataRow(\DOMDocument $xml, \DOMElement $table, \Database\R
 					}
 				}
 			}
-			elseif (\Config::get('uploadPath') != 'files' && $t == 'tl_style' && ($k == 'bgimage' || $k == 'liststyleimage'))
+			elseif ($t == 'tl_style' && ($k == 'bgimage' || $k == 'liststyleimage'))
 			{
 				$v = $this->standardizeUploadPath($v);
 			}
@@ -1102,12 +1102,6 @@ protected function customizeUploadPath($strPath)
 			return '';
 		}
 
-		// Using the default path already
-		if (\Config::get('uploadPath') == 'files')
-		{
-			return $strPath;
-		}
-
 		return preg_replace('@^(tl_)?files/@', \Config::get('uploadPath') . '/', $strPath);
 	}
 
@@ -1124,12 +1118,6 @@ protected function standardizeUploadPath($strPath)
 			return '';
 		}
 
-		// Using the default path already
-		if (\Config::get('uploadPath') == 'files')
-		{
-			return $strPath;
-		}
-
 		return preg_replace('@^' . preg_quote(\Config::get('uploadPath'), '@') . '/@', 'files/', $strPath);
 	}
 }