mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-10-17 23:56:09 +02:00
Code Issues Releases Wiki Activity

Version 1.2.8. Image Management

Browse Source
This commit is contained in:
Sebastian
2018-12-04 21:23:15 +01:00
parent 979ebebe1b
commit 39d59df52a
12 changed files with 70 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
system/Settings.php
View File

@@ -8,13 +8,15 @@ class Settings
{
$settings = self::getDefaultSettings();
$userSettings = self::getUserSettings();
$imgSettings = isset($settings['images']) ? $settings['images'] : [];
if($userSettings)
{
$imgSettings = $settings['images'];
$settings = array_merge($settings, $userSettings);
$settings['setup'] = false;
}
$settings['images'] = isset($userSettings['images']) ? array_merge($imgSettings, $userSettings['images']) : $imgSettings;
$settings['themePath'] = $settings['rootPath'] . $settings['themeFolder'] . DIRECTORY_SEPARATOR . $settings['theme'];
@@ -48,7 +50,7 @@ class Settings
'version' => '1.2.8',
'setup' => true,
'welcome' => true,
'images' => ['live' => ['width' => 720], 'mlibrary' => ['width' => 50, 'height' => 50]],
'images' => ['live' => ['width' => 820], 'mlibrary' => ['width' => 50, 'height' => 50]],
];
}