diff --git a/inc/SP/Controller/AccountController.class.php b/inc/SP/Controller/AccountController.class.php index 5eedd305..8565db66 100644 --- a/inc/SP/Controller/AccountController.class.php +++ b/inc/SP/Controller/AccountController.class.php @@ -193,13 +193,13 @@ class AccountController extends ControllerBase implements ActionsInterface $this->view->assign('publicLinkUrl', $publicLinkUrl); $this->view->assign('accountPassDate', gmdate('Y-m-d H:i:s', $this->AccountData->getAccountPassDate())); - $this->view->assign('accountPassDateChange', gmdate('Y-m-d', $this->AccountData->getAccountPassDateChange())); + $this->view->assign('accountPassDateChange', gmdate('Y-m-d', $this->AccountData->getAccountPassDateChange() ?: '')); } else { - $this->view->assign('accountPassDateChange', gmdate('Y-m-d', time() + 2592000)); + $this->view->assign('accountPassDateChange', gmdate('Y-m-d', time() + 7776000)); } $this->view->assign('actionId', $this->getAction()); - $this->view->assign('accountParentId', Session::getLastAcountId()); +// $this->view->assign('accountParentId', Session::getLastAcountId()); $this->view->assign('categories', Category::getItem()->getItemsForSelect()); $this->view->assign('customers', Customer::getItem()->getItemsForSelect()); $this->view->assign('otherUsers', UserUtil::getUsersLogin()); diff --git a/inc/SP/Util/Util.class.php b/inc/SP/Util/Util.class.php index 33cf5aa4..c1f16da7 100644 --- a/inc/SP/Util/Util.class.php +++ b/inc/SP/Util/Util.class.php @@ -364,7 +364,7 @@ class Util */ public static function getVersion($retBuild = false) { - $build = '17011301'; + $build = '17011302'; $version = [2, 0, 0]; if ($retBuild) { diff --git a/inc/sql/1316100601.sql b/inc/sql/1316100601.sql index 889e95d2..3b0bfcc1 100644 --- a/inc/sql/1316100601.sql +++ b/inc/sql/1316100601.sql @@ -25,7 +25,7 @@ ALTER TABLE `accUsers` DROP PRIMARY KEY; ALTER TABLE `accounts` - CHANGE COLUMN `account_id` `account_id` SMALLINT(5) UNSIGNED NOT NULL, + CHANGE COLUMN `account_id` `account_id` SMALLINT(5) UNSIGNED NOT NULL AUTO_INCREMENT, CHANGE COLUMN `account_userId` `account_userId` SMALLINT(5) UNSIGNED NOT NULL, CHANGE COLUMN `account_userEditId` `account_userEditId` SMALLINT(5) UNSIGNED NOT NULL, CHANGE COLUMN `account_categoryId` `account_categoryId` SMALLINT(5) UNSIGNED NOT NULL,