diff --git a/install/includes/schema.sql b/install/includes/schema.sql index 884b25f4..08339856 100644 --- a/install/includes/schema.sql +++ b/install/includes/schema.sql @@ -57,7 +57,7 @@ CREATE TABLE `myaac_commands` `hidden` TINYINT(1) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), UNIQUE (`words`) -) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;; +) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8; CREATE TABLE `myaac_config` ( @@ -139,7 +139,7 @@ CREATE TABLE `myaac_items` `plural` VARCHAR(50) NOT NULL DEFAULT '', `attributes` VARCHAR(500) NOT NULL DEFAULT '', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8;E +) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8; CREATE TABLE `myaac_menu` ( diff --git a/install/steps/7-finish.php b/install/steps/7-finish.php index 30b707b5..e026ff68 100644 --- a/install/steps/7-finish.php +++ b/install/steps/7-finish.php @@ -47,7 +47,6 @@ else { if($account_db->isLoaded()) { $account_db->setPassword(encrypt($password)); $account_db->setEMail($_SESSION['var_mail_admin']); - $account_db->setCountry("--"); $account_db->save(); $account_used = &$account_db; @@ -63,7 +62,6 @@ else { $new_account->setPassword(encrypt($password)); $new_account->setEMail($_SESSION['var_mail_admin']); - $new_account->setCountry("--"); $new_account->unblock(); $new_account->save(); diff --git a/system/libs/pot/OTS_Account.php b/system/libs/pot/OTS_Account.php index 1daa642b..d655a812 100644 --- a/system/libs/pot/OTS_Account.php +++ b/system/libs/pot/OTS_Account.php @@ -39,7 +39,7 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable * @var array * @version 0.1.5 */ - private $data = array('email' => '', 'blocked' => false, 'rlname' => '','location' => '','web_flags' => 0, 'lastday' => 0, 'premdays' => 0, 'created' => 0); + private $data = array('email' => '', 'blocked' => false, 'rlname' => '','location' => '', 'country' => '','web_flags' => 0, 'lastday' => 0, 'premdays' => 0, 'created' => 0); public static $cache = array(); /** @@ -398,7 +398,7 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable return $this->data['created']; } - + /** * Name. * diff --git a/system/templates/admin.menus.js.html.twig b/system/templates/admin.menus.js.html.twig index dbce71cf..beed6381 100644 --- a/system/templates/admin.menus.js.html.twig +++ b/system/templates/admin.menus.js.html.twig @@ -69,4 +69,4 @@ ] }); } - \ No newline at end of file +