diff --git a/kernel/admin/controllers/themes.php b/kernel/admin/controllers/themes.php
index 98d22230..1181ac73 100644
--- a/kernel/admin/controllers/themes.php
+++ b/kernel/admin/controllers/themes.php
@@ -34,16 +34,17 @@ foreach($themesPaths as $themePath)
{
$database = new dbJSON($langDefaultFile, false);
$databaseArray = $database->db;
+ $themeMetaData = $database->db['theme-data'];
// Check if exists locale language
if( Sanitize::pathFile($langLocaleFile) ) {
$database = new dbJSON($langLocaleFile, false);
- $databaseArray['theme-data'] = array_merge($databaseArray['theme-data'], $database->db['theme-data']);
+ $themeMetaData = array_merge($themeMetaData, $database->db['theme-data']);
}
- $databaseArray['theme-data']['dirname'] = basename($themePath);
+ $themeMetaData['dirname'] = basename($themePath);
// Theme data
- array_push($themes, $databaseArray['theme-data']);
+ array_push($themes, $themeMetaData);
}
}
diff --git a/kernel/boot/rules/99.themes.php b/kernel/boot/rules/99.themes.php
index 91ace801..cc0e2c4a 100644
--- a/kernel/boot/rules/99.themes.php
+++ b/kernel/boot/rules/99.themes.php
@@ -26,25 +26,27 @@ $langLocaleFile = PATH_THEME.'languages'.DS.$Site->locale().'.json';
$langDefaultFile = PATH_THEME.'languages'.DS.'en_US.json';
$database = false;
+// Theme meta data from English
+if( Sanitize::pathFile($langDefaultFile) ) {
+ $database = new dbJSON($langDefaultFile, false);
+ $themeMetaData = $database->db['theme-data'];
+}
+
// Check if exists locale language
if( Sanitize::pathFile($langLocaleFile) ) {
$database = new dbJSON($langLocaleFile, false);
}
-// Check if exists default language
-elseif( Sanitize::pathFile($langDefaultFile) ) {
- $database = new dbJSON($langDefaultFile, false);
-}
if($database!==false)
{
$databaseArray = $database->db;
// Theme data
- $theme = $databaseArray['theme-data'];
+ $theme = $themeMetaData;
- // Remove theme data
+ // Remove theme meta data
unset($databaseArray['theme-data']);
- // Add new words from language theme
+ // Add new words/phrase from language theme
$Language->add($databaseArray);
}
diff --git a/plugins/disqus/languages/en_US.json b/plugins/disqus/languages/en_US.json
index e53d65d6..f4010bcc 100644
--- a/plugins/disqus/languages/en_US.json
+++ b/plugins/disqus/languages/en_US.json
@@ -6,8 +6,8 @@
"author": "Bludit",
"email": "",
"website": "https://github.com/dignajar/bludit-plugins",
- "version": "0.6",
- "releaseDate": "2015-11-13"
+ "version": "0.7",
+ "releaseDate": "2015-11-28"
},
"disqus-shortname": "Disqus shortname",
"enable-disqus-on-pages": "Enable Disqus on pages",
diff --git a/plugins/opengraph/languages/en_US.json b/plugins/opengraph/languages/en_US.json
index 56690f5a..0c5c9252 100644
--- a/plugins/opengraph/languages/en_US.json
+++ b/plugins/opengraph/languages/en_US.json
@@ -6,7 +6,7 @@
"author": "Bludit",
"email": "",
"website": "https://github.com/dignajar/bludit-plugins",
- "version": "0.6",
- "releaseDate": "2015-11-13"
+ "version": "0.7",
+ "releaseDate": "2015-11-28"
}
}
\ No newline at end of file
diff --git a/themes/pure/php/head.php b/themes/pure/php/head.php
index 3f554b4b..5f679ed5 100644
--- a/themes/pure/php/head.php
+++ b/themes/pure/php/head.php
@@ -32,7 +32,7 @@
?>
-
+