Index: branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r7075 -r7564
--- branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 7075)
+++ branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 7564)
@@ -158,6 +158,10 @@
while (($sub_folder = readdir($fh))) {
$full_path = FULL_PATH.$folderPath.'/'.$sub_folder;
if ($this->isDir($full_path)) {
+ //the following is to exclude OLD, not removed files when upgrading to 'core'
+ if (preg_match('^/\/kernel\/kernel4\//', $folderPath) || ($folderPath == '/kernel/units' && file_exists(FULL_PATH.$this->getConfigName('/core/units/'.$sub_folder)))) {
+ continue;
+ }
if (file_exists(FULL_PATH.$this->getConfigName($folderPath.'/'.$sub_folder))) {
$this->configFiles[] = $this->getConfigName($folderPath.'/'.$sub_folder);
}
@@ -469,7 +473,7 @@
$config['BasePath'] = dirname(FULL_PATH.$filename);
if (isset($config['AdminTemplatePath'])) {
// append template base folder for admin templates path of this prefix
- $module_templates = $rets[1] == 'kernel' ? '' : $rets[1].'/';
+ $module_templates = $rets[1] == 'core' ? 'in-portal/' : $rets[1].'/';
$config['AdminTemplatePath'] = $module_templates.$config['AdminTemplatePath'];
}
$this->configData[$prefix] = $config;
Index: branches/unlabeled/unlabeled-1.100.2/admin/install/langpacks/english.lang
===================================================================
diff -u -r7538 -r7564
--- branches/unlabeled/unlabeled-1.100.2/admin/install/langpacks/english.lang (.../english.lang) (revision 7538)
+++ branches/unlabeled/unlabeled-1.100.2/admin/install/langpacks/english.lang (.../english.lang) (revision 7564)
@@ -18,6 +18,7 @@
QXJ0aWNsZSBUaXRsZQ==
QXV0bw==
QXV0b21hdGlj
+ QXZhaWxhYmxlIENvbHVtbnM=
QmFja2dyb3VuZA==
QmFuIGVtYWlsIGFkZHJlc3M=
QmFuIElQIGFkZHJlc3M=
@@ -87,6 +88,7 @@
RHVyYXRpb24gVHlwZQ==
RWZmZWN0aXZl
RW1haWw=
+ Jm5ic3A7
RXZlbnQ=
RmllbGQgTmFtZQ==
Rmlyc3QgTmFtZQ==
@@ -397,8 +399,6 @@
TWFyZ2luIFRvcA==
TWVzc2FnZSBCb2R5
TWVzc2FnZSBUeXBl
- TWV0YSBEZXNjcmlwdGlvbg==
- TWV0YSBLZXl3b3Jkcw==
TW9kaWZpZWQ=
TW9kdWxl
TmFtZQ==
@@ -588,6 +588,7 @@
Qm90aA==
RnJvbnQ=
RWRpdG9yJ3MgcGljaw==
+ U2VsZWN0ZWQgQ29sdW1ucw==
UG9w
UG9zaXRpb24gQW5kIFZpc2liaWxpdHk=
TmV3IHBvc3RzIChkYXlzKQ==
@@ -983,6 +984,7 @@
VGh1bWJuYWlsIEltYWdl
VHJhbnNsYXRpb24=
U2VhcmNoIFVzZXJz
+ U2VsZWN0IENvbHVtbnM=
U2VsZWN0aW5nIENhdGVnb3JpZXM=
RW1wdHkgc2VsZWN0aW9u
T25lIGZpZWxkIGZvciBlYWNoIGNhdGVnb3J5IGxldmVs
@@ -1330,6 +1332,7 @@
U2VsZWN0IHJlbGF0aW9u
U2VsZWN0IGNhdGVnb3J5
Q2Vuc29yc2hpcA==
+ Q29sdW1uIFBpY2tlcg==
Q29tbXVuaXR5
Q29uZmlndXJhdGlvbg==
Q291cG9uIFNlbGVjdG9y
@@ -1673,8 +1676,6 @@
UGFzc3dvcmQgcmVzZXQgY29kZSBpcyBub3QgdmFsaWQ=
UHJpY2VzIG9mIG9uZSBvciBtb3JlIGl0ZW1zIGluIHlvdXIgc2hvcHBpbmcgY2FydCBoYXZlIGJlZW4gY2hhbmdlZCBkdWUgdG8geW91ciBsb2dpbiwgcGxlYXNlIHJldmlldyBjaGFuZ2VzLg==
RW1haWxBZGRyZXNz
- QWRkaXRpb25hbCBJbWFnZXM=
- QURESVRJT05BTCBJTUFHRVM=
Tm8gUGVybWlzc2lvbnM=
UHJvZHVjdCBEZXNjcmlwdGlvbg==
Q29tcGFueQ==
Index: branches/unlabeled/unlabeled-1.9.2/core/units/modules/modules_event_handler.php
===================================================================
diff -u -r7551 -r7564
--- branches/unlabeled/unlabeled-1.9.2/core/units/modules/modules_event_handler.php (.../modules_event_handler.php) (revision 7551)
+++ branches/unlabeled/unlabeled-1.9.2/core/units/modules/modules_event_handler.php (.../modules_event_handler.php) (revision 7564)
@@ -21,10 +21,13 @@
*/
function SetCustomQuery(&$event)
{
+ $object =& $event->getObject();
if ($event->Special) {
- $object =& $event->getObject();
$object->addFilter('current_module', 'Name = '.$event->Special);
}
+ if (!$this->Application->isModuleEnabled('Proj-Base')) {
+ $object->addFilter('not_core', 'Name != '.$this->Conn->qstr('Core'));
+ }
}
function mapEvents()
Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt
===================================================================
diff -u -r7545 -r7564
--- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt (.../changelog_1_4_0.txt) (revision 7545)
+++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt (.../changelog_1_4_0.txt) (revision 7564)
@@ -26,7 +26,7 @@
File in-portal/admin/install/upgrade_errors.php changed
File in-portal/admin/install/langpacks/english.lang changed
File in-portal/admin/install/upgrades/changelog_1_3_0.txt changed
-File in-portal/admin/install/upgrades/changelog_1_4_0.txt is new; release_1_4_0 revision 1.1.2.12
+File in-portal/admin/install/upgrades/changelog_1_4_0.txt is new; release_1_4_0 revision 1.1.2.13
File in-portal/admin/install/upgrades/inportal_upgrade_v1.3.2.sql is new; release_1_4_0 revision 1.1.2.2
File in-portal/admin/install/upgrades/inportal_upgrade_v1.4.0.sql is new; release_1_4_0 revision 1.1.2.1
File in-portal/admin/users/adduser.php changed
@@ -352,6 +352,8 @@
File kernel.X/core/admin_templates/img/menu_arrow.gif is new; release_1_4_0 revision 1.1
File kernel.X/core/admin_templates/img/menu_bar.gif is new; release_1_4_0 revision 1.1
File kernel.X/core/admin_templates/img/menu_dot.gif is new; release_1_4_0 revision 1.1
+File kernel.X/core/admin_templates/img/perm_green.gif is new; release_1_4_0 revision 1.1.2.1
+File kernel.X/core/admin_templates/img/perm_red.gif is new; release_1_4_0 revision 1.1.2.1
File kernel.X/core/admin_templates/img/progress_done.gif is new; release_1_4_0 revision 1.1.2.1
File kernel.X/core/admin_templates/img/progress_left.gif is new; release_1_4_0 revision 1.1.2.1
File kernel.X/core/admin_templates/img/spacer.gif is new; release_1_4_0 revision 1.1
@@ -365,6 +367,7 @@
File kernel.X/core/admin_templates/img/tab_active_right.gif is new; release_1_4_0 revision 1.1
File kernel.X/core/admin_templates/img/tab_back.gif is new; release_1_4_0 revision 1.1
File kernel.X/core/admin_templates/img/tab_back.jpg is new; release_1_4_0 revision 1.1.2.1
+File kernel.X/core/admin_templates/img/tab_back3.jpg is new; release_1_4_0 revision 1.1.2.1
File kernel.X/core/admin_templates/img/tab_left.gif is new; release_1_4_0 revision 1.1
File kernel.X/core/admin_templates/img/tab_right.gif is new; release_1_4_0 revision 1.1
File kernel.X/core/admin_templates/img/tabnav_back.gif is new; release_1_4_0 revision 1.1
@@ -720,7 +723,7 @@
File kernel.X/core/units/categories/categories_tag_processor.php is new; release_1_4_0 revision 1.31.2.5
File kernel.X/core/units/category_items/category_items_config.php is new; release_1_4_0 revision 1.12
File kernel.X/core/units/category_items/category_items_dbitem.php is new; release_1_4_0 revision 1.4
-File kernel.X/core/units/category_items/category_items_event_handler.php is new; release_1_4_0 revision 1.9.2.1
+File kernel.X/core/units/category_items/category_items_event_handler.php is new; release_1_4_0 revision 1.9.2.2
File kernel.X/core/units/category_items/category_items_tag_processor.php is new; release_1_4_0 revision 1.6
File kernel.X/core/units/configuration/configuration.php is new; release_1_4_0 revision 1.1
File kernel.X/core/units/configuration/configuration_config.php is new; release_1_4_0 revision 1.15