Index: branches/1.3.x/install/upgrades.sql =================================================================== diff -u -N -r15668 -r15896 --- branches/1.3.x/install/upgrades.sql (.../upgrades.sql) (revision 15668) +++ branches/1.3.x/install/upgrades.sql (.../upgrades.sql) (revision 15896) @@ -61,3 +61,10 @@ # ===== v 1.2.0 ===== # ===== v 1.2.1-B1 ===== + +# ===== v 1.2.1-B2 ===== +UPDATE Modules +SET ClassNamespace = 'Intechnic\\InPortal\\Modules\\Custom' +WHERE `Name` = 'Custom'; + +# ===== v 1.2.1-RC1 ===== Index: branches/1.3.x/install/english.lang =================================================================== diff -u -N -r15496 -r15896 --- branches/1.3.x/install/english.lang (.../english.lang) (revision 15496) +++ branches/1.3.x/install/english.lang (.../english.lang) (revision 15896) @@ -1,5 +1,9 @@ - - + + + + + JGJvZHkNCjxici8+PGJyLz4NCg0KU2luY2VyZWx5LDxici8+PGJyLz4NCg0KV2Vic2l0ZSBhZG1pbmlzdHJhdGlvbi4NCg0KPCEtLSMjIDxpbnAyOmVtYWlsLWxvZ19JdGVtTGluayB0ZW1wbGF0ZT0icGxhdGZvcm0vbXlfYWNjb3VudC9lbWFpbCIvPiAjIy0tPg== + RGF0YSBmaWxl R29vZA== Index: branches/1.3.x/install/install_data.sql =================================================================== diff -u -N -r15496 -r15896 --- branches/1.3.x/install/install_data.sql (.../install_data.sql) (revision 15496) +++ branches/1.3.x/install/install_data.sql (.../install_data.sql) (revision 15896) @@ -4,4 +4,4 @@ INSERT INTO Permissions VALUES(DEFAULT, 'custom:widgets.add', 11, 1, 1, 0); INSERT INTO Permissions VALUES(DEFAULT, 'custom:widgets.view', 11, 1, 1, 0); -INSERT INTO Modules VALUES ('Custom', 'modules/custom/', 'custom-sections', DEFAULT, 1, 10, 'custom/', 0, NULL, NULL); +INSERT INTO Modules VALUES ('Custom', 'modules/custom/', 'Intechnic\\InPortal\\Modules\\Custom', 'custom-sections', DEFAULT, 1, 10, 'custom/', 0, NULL, NULL); Index: branches/1.3.x/install/upgrades.php =================================================================== diff -u -N -r15668 -r15896 --- branches/1.3.x/install/upgrades.php (.../upgrades.php) (revision 15668) +++ branches/1.3.x/install/upgrades.php (.../upgrades.php) (revision 15896) @@ -1,6 +1,6 @@ Array ('Core' => '5.2.0-RC1'), '1.2.0' => Array ('Core' => '5.2.0'), '1.2.1-B1' => Array ('Core' => '5.2.1-B1'), + '1.2.1-B2' => Array ('Core' => '5.2.1-B2'), + '1.2.1-RC1' => Array ('Core' => '5.2.1-RC1'), ); } } Index: branches/1.3.x/install.php =================================================================== diff -u -N -r15496 -r15896 --- branches/1.3.x/install.php (.../install.php) (revision 15496) +++ branches/1.3.x/install.php (.../install.php) (revision 15896) @@ -1,32 +1,38 @@ toolkit; - /* @var $toolkit kInstallToolkit */ - } - $application =& kApplication::Instance(); - $application->Init(); + $toolkit = new kInstallToolkit(); +} +else { + // install, using installation wizard + $toolkit =& $this->toolkit; + /* @var $toolkit kInstallToolkit */ +} - if ($application->RecallVar('user_id') != USER_ROOT) { - die('restricted access!'); - } +$application =& kApplication::Instance(); +$application->Init(); - $toolkit->RunSQL('/' . $module_folder .'/install/install_schema.sql'); - $toolkit->RunSQL('/' . $module_folder .'/install/install_data.sql'); - $toolkit->ImportLanguage('/' . $module_folder .'/install/english'); +if ( $application->RecallVar('user_id') != USER_ROOT ) { + die('restricted access!'); +} - $toolkit->finalizeModuleInstall($module_folder, false); \ No newline at end of file +$toolkit->RunSQL('/' . $module_folder . '/install/install_schema.sql'); +$toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql'); +$toolkit->ImportLanguage('/' . $module_folder . '/install/english'); + +$toolkit->finalizeModuleInstall($module_folder, false); \ No newline at end of file