commit 471718df3144bbcfb7097d925ff6bb50775df108
parent 87c68504823f9c127a0a0a65ae02f30f8bc382a6
Author: markseu <mark2011@mayberg.se>
Date: Sun, 26 Jul 2020 20:36:06 +0200
Refactored code base, updated system files
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/system/extensions/install.php b/system/extensions/install.php
@@ -125,7 +125,7 @@ class YellowInstall {
$fileName = $matches[1];
list($dummy1, $entry, $dummy2) = $this->yellow->toolbox->getTextList($matches[2], ",", 3);
$fileData = $zip->getFromName($pathBase.basename($entry));
- if (preg_match("/^(.*).php$/", basename($entry), $tokens) && in_array($tokens[1], $languagesFound) && !is_file($fileName)) {
+ if (preg_match("/^(.*)\.php$/", basename($entry), $tokens) && in_array($tokens[1], $languagesFound) && !is_file($fileName)) {
$statusCode = $this->yellow->extension->get("update")->updateExtensionFile($fileName, $fileData, $modified, 0, 0, "create", false, $extension);
}
if (preg_match("/^(.*)\.txt$/", basename($entry), $tokens) && in_array($tokens[1], $languagesFound) && !is_file($fileName)) {
@@ -137,7 +137,7 @@ class YellowInstall {
}
$zip->close();
if ($statusCode==200) {
- $this->yellow->language->load($this->yellow->system->get("coreExtensionDirectory").$this->yellow->system->get("coreLanguageFile"));
+ $this->yellow->language->load($this->yellow->system->get("coreExtensionDirectory").".*\.txt");
}
} else {
$statusCode = 500;