Index: branches/5.0.x/core/units/modules/modules_event_handler.php
===================================================================
diff -u -r12434 -r12587
--- branches/5.0.x/core/units/modules/modules_event_handler.php (.../modules_event_handler.php) (revision 12434)
+++ branches/5.0.x/core/units/modules/modules_event_handler.php (.../modules_event_handler.php) (revision 12587)
@@ -1,6 +1,6 @@
$toolkit->getModuleName($module),
- 'Loaded' => 0,
+ 'Path' => $module . '/',
'Version' => $toolkit->GetMaxModuleVersion($module),
+ 'Loaded' => 0,
+ 'BuildDate' => null,
);
$object->addRecord($module_record);
Index: branches/5.0.x/core/install/install_toolkit.php
===================================================================
diff -u -r12457 -r12587
--- branches/5.0.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 12457)
+++ branches/5.0.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 12587)
@@ -1,6 +1,6 @@
Conn->Query($sql);
}
Index: branches/5.0.x/core/install.php
===================================================================
diff -u -r12559 -r12587
--- branches/5.0.x/core/install.php (.../install.php) (revision 12559)
+++ branches/5.0.x/core/install.php (.../install.php) (revision 12587)
@@ -1,6 +1,6 @@
GetUpgradableModules();
+
+ if (array_key_exists('core', $upgrade_data) && !in_array('core', $modules)) {
+ // core can be upgraded, but isn't selected
$this->errorMessage = 'Please select "Core" as interface module';
}
@@ -583,6 +586,9 @@
// set module "Core" version after install (based on upgrade scripts)
$this->toolkit->SetModuleVersion('Core');
+
+ // for now we set "In-Portal" module version to "Core" module version (during clean install)
+ $this->toolkit->SetModuleVersion('In-Portal', $this->toolkit->GetMaxModuleVersion('Core'));
}
break;
@@ -883,6 +889,11 @@
// after upgrade sqls are executed update version and upgrade language pack
$this->toolkit->SetModuleVersion($module_name, $module_info['ToVersion']);
}
+
+ // for now we set "In-Portal" module version to "Core" module version (during upgrade)
+ if (in_array('core', $modules)) {
+ $this->toolkit->SetModuleVersion('In-Portal', $upgrade_data['core']['ToVersion']);
+ }
}
break;
Index: branches/5.0.x/core/install/upgrades.sql
===================================================================
diff -u -r12575 -r12587
--- branches/5.0.x/core/install/upgrades.sql (.../upgrades.sql) (revision 12575)
+++ branches/5.0.x/core/install/upgrades.sql (.../upgrades.sql) (revision 12587)
@@ -1495,4 +1495,4 @@
INSERT INTO Permissions VALUES (DEFAULT, 'in-portal:service.edit', 11, 1, 1, 0);
-UPDATE Modules SET Version = '5.0.1', Loaded = 1 WHERE Name = 'In-Portal';
\ No newline at end of file
+UPDATE Modules SET Loaded = 1 WHERE `Name` = 'In-Portal';
\ No newline at end of file
Index: branches/5.0.x/core/units/modules/modules_config.php
===================================================================
diff -u -r12576 -r12587
--- branches/5.0.x/core/units/modules/modules_config.php (.../modules_config.php) (revision 12576)
+++ branches/5.0.x/core/units/modules/modules_config.php (.../modules_config.php) (revision 12587)
@@ -1,6 +1,6 @@
Array('title' => 'la_col_Version', 'filter_block' => 'grid_like_filter', 'width' => 100, ),
'Path' => Array('title' => 'la_col_SystemPath', 'filter_block' => 'grid_like_filter', 'width' => 200, ),
'BuildDate' => Array('title' => 'la_col_BuildDate', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ),
- 'LoadOrder' => Array('title' => 'la_col_Priority', 'filter_block' => 'grid_like_filter', 'width' => 60, ),
'Loaded' => Array('title' => 'la_col_Status', 'header_block' => 'grid_column_title_no_sorting', 'data_block' => 'grid_module_td', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
),
),
Index: branches/5.0.x/core/install/install_data.sql
===================================================================
diff -u -r12568 -r12587
--- branches/5.0.x/core/install/install_data.sql (.../install_data.sql) (revision 12568)
+++ branches/5.0.x/core/install/install_data.sql (.../install_data.sql) (revision 12587)
@@ -1126,5 +1126,5 @@
#INSERT INTO PageContent VALUES (DEFAULT, 1, 1, 'In-portal is a revolutionary Web Site management system that allows you to automate and facilitate management of large portal and community web sites. Regardless of whether you are running a directory site or a content news portal, a community site or an online mall, In-portal will enhance your web site management experience with innovative.
We are proud to present our newly developed "default" theme that introduces a fresh look as well totally new approach in the template system.
', NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0);
-INSERT INTO Modules VALUES ('Core', 'core/', 'adm', DEFAULT, 1, 1, '', 0, '0');
-INSERT INTO Modules VALUES ('In-Portal', 'core/', 'm', '5.0.1', 1, 0, '', 0, '0');
\ No newline at end of file
+INSERT INTO Modules VALUES ('Core', 'core/', 'adm', DEFAULT, 1, 1, '', 0, NULL);
+INSERT INTO Modules VALUES ('In-Portal', 'core/', 'm', DEFAULT, 1, 0, '', 0, NULL);
\ No newline at end of file