Merge pull request #2575 from MPOS/development

UPDATE : Development to Master
This commit is contained in:
Sebastian Grewe 2017-07-18 15:27:48 +02:00 committed by GitHub
commit e2a3536d7e
2 changed files with 2 additions and 2 deletions

View File

@ -225,7 +225,7 @@ if ($setting->getValue('website_theme') == "mpos")
$_SESSION['POPUP'][] = array('CONTENT' => 'You are using an old Theme that will not be maintained in the future.', 'TYPE' => 'alert alert-warning');
// Check we can load the theme at all
if ( !in_array($setting->getValue('website_theme'), $template->getThemes()))
if ( !in_array($setting->getValue('website_theme', 'bootstrap'), $template->getThemes()))
die('Unable to find your selected theme `' . $setting->getValue('website_theme') . '` in the list of available themes. Please reset your `website_theme` setting in your database.');
// So we can display additional info

View File

@ -1,7 +1,7 @@
<?php
$defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
define('MPOS_VERSION', '1.0.6');
define('MPOS_VERSION', '1.0.7');
define('DB_VERSION', '1.0.2');
define('CONFIG_VERSION', '1.0.1');
define('HASH_VERSION', 1);