Alex Trofimov hace 4 años
padre
commit
4adee2ed0f

+ 1 - 1
inc/version.inc.php

@@ -7,6 +7,6 @@
  * @{
  */
 
-define('BX_DOL_VERSION', '13.0.0-DEV1'); ///< system files version, for DB version @see bx_get_ver, DB and files version must match
+define('BX_DOL_VERSION', '13.0.0-A2'); ///< system files version, for DB version @see bx_get_ver, DB and files version must match
 
 /** @} */

+ 1 - 1
install/index.php

@@ -10,7 +10,7 @@
 define ('BX_DOL_INSTALL',  true);
 define ('BX_SKIP_INSTALL_CHECK', true);
 
-define ('BX_DOL_VER', '13.0.0-A1');
+define ('BX_DOL_VER', '13.0.0-A2');
 
 define ('BX_INSTALL_DEFAULT_LANGUAGE', 'en');
 

+ 6 - 6
upgrade/files/12.1.0-13.0.0.A1/files_delete.php

@@ -36,12 +36,12 @@ $aFilesDelete = array(
 	'plugins/paypal/composer',
 	'plugins/paypal/paypal',
 	'plugins/paypal/autoload.php',
-	'plugins/phpmailer/Exception.php',
-	'plugins/phpmailer/LICENSE',
-	'plugins/phpmailer/PHPMailer.php',
-	'plugins/phpmailer/README.md',
-	'plugins/phpmailer/SMTP.php',
-	'plugins/phpmailer/VERSION',
+//	'plugins/phpmailer/Exception.php',
+//	'plugins/phpmailer/LICENSE',
+//	'plugins/phpmailer/PHPMailer.php',
+//	'plugins/phpmailer/README.md',
+//	'plugins/phpmailer/SMTP.php',
+//	'plugins/phpmailer/VERSION',
 	'plugins/recaptcha',
 	'plugins/recurly/recurly',
 	'plugins/recurly/LICENSE',

+ 9 - 0
upgrade/files/13.0.0.A1-13.0.0.A2/check.php

@@ -0,0 +1,9 @@
+<?php
+
+$mixCheckResult = 'Update can not be applied';
+
+$sVer = $this->oDb->getOne("SELECT `version` FROM `sys_modules` WHERE `name` = 'system'");
+if ('13.0.0.A1' == $sVer || '13.0.0-A1' == $sVer)
+    $mixCheckResult = true;
+
+return $mixCheckResult;

+ 3 - 0
upgrade/files/13.0.0.A1-13.0.0.A2/script.php

@@ -0,0 +1,3 @@
+<?php
+
+    return true;

+ 16 - 0
upgrade/files/13.0.0.A1-13.0.0.A2/sql.sql

@@ -0,0 +1,16 @@
+
+UPDATE `sys_options` SET `type` = 'digit' WHERE `name` = 'sys_editor_default';
+UPDATE `sys_options` SET `value` = 'sys_quill' WHERE `name` = 'sys_editor_default' AND `value` IN('sys_recaptcha_new', 'sys_recaptcha_invisible', 'sys_hcaptcha', 'sys_recaptcha', '');
+
+-- Forms
+
+UPDATE `sys_form_inputs` SET `value` = '', `values` = '' WHERE `object` IN('sys_comment','sys_review') AND `name` IN('sys', 'id', 'action', 'cmt_id', 'cmt_parent_id', 'cmt_text', 'cmt_anonymous', 'cmt_mood');
+UPDATE `sys_form_inputs` SET `value` = '', `values` = 'cmt_submit,cmt_cancel' WHERE `object` IN('sys_comment') AND `name` IN('cmt_controls');
+UPDATE `sys_form_inputs` SET `value` = '_sys_form_comment_input_cancel', `values` = '' WHERE `object` IN('sys_comment') AND `name` IN('cmt_cancel');
+UPDATE `sys_form_inputs` SET `value` = '_sys_form_comment_input_submit', `values` = '' WHERE `object` IN('sys_comment') AND `name` IN('cmt_submit');
+UPDATE `sys_form_inputs` SET `value` = '_sys_form_review_input_submit', `values` = '' WHERE `object` IN('sys_review') AND `name` IN('cmt_submit');
+
+-- Last step is to update current version
+
+UPDATE `sys_modules` SET `version` = '13.0.0-A2' WHERE (`version` = '13.0.0.A1' OR `version` = '13.0.0-A1') AND `name` = 'system';
+