Index: branches/5.3.x/install/upgrades.sql =================================================================== diff -u -N -r15672 -r15900 --- branches/5.3.x/install/upgrades.sql (.../upgrades.sql) (revision 15672) +++ branches/5.3.x/install/upgrades.sql (.../upgrades.sql) (revision 15900) @@ -196,3 +196,10 @@ INSERT INTO Permissions VALUES(DEFAULT, 'in-link:configuration_output.add', 11, 1, 1, 0); # ===== v 5.2.1-B1 ===== + +# ===== v 5.2.1-B2 ===== +UPDATE Modules +SET ClassNamespace = 'Intechnic\\InPortal\\Modules\\InLink' +WHERE `Name` = 'In-Link'; + +# ===== v 5.2.1-RC1 ===== Index: branches/5.3.x/install/english.lang =================================================================== diff -u -N -r15486 -r15900 --- branches/5.3.x/install/english.lang (.../english.lang) (revision 15486) +++ branches/5.3.x/install/english.lang (.../english.lang) (revision 15900) @@ -1,5 +1,9 @@ - - + + + + + JGJvZHkNCjxici8+PGJyLz4NCg0KU2luY2VyZWx5LDxici8+PGJyLz4NCg0KV2Vic2l0ZSBhZG1pbmlzdHJhdGlvbi4NCg0KPCEtLSMjIDxpbnAyOmVtYWlsLWxvZ19JdGVtTGluayB0ZW1wbGF0ZT0icGxhdGZvcm0vbXlfYWNjb3VudC9lbWFpbCIvPiAjIy0tPg== + QWN0aW9ucyBVcG9uIEV4cGlyYXRpb24= QWN0aW9ucyBVcG9uIFB1cmNoYXNl Index: branches/5.3.x/install/install_data.sql =================================================================== diff -u -N -r15672 -r15900 --- branches/5.3.x/install/install_data.sql (.../install_data.sql) (revision 15672) +++ branches/5.3.x/install/install_data.sql (.../install_data.sql) (revision 15900) @@ -223,4 +223,4 @@ INSERT INTO Counters VALUES (DEFAULT, 'linkhits_count', 'SELECT ROUND(SUM(Hits)) FROM <%PREFIX%>Link', NULL, NULL, '300', '0', '|Link|'); -INSERT INTO Modules VALUES ('In-Link', 'modules/in-link/', 'l', DEFAULT, 1, 1, 'in-link/', 2, NULL, NULL); +INSERT INTO Modules VALUES ('In-Link', 'modules/in-link/', 'Intechnic\\InPortal\\Modules\\InLink', 'l', DEFAULT, 1, 1, 'in-link/', 2, NULL, NULL); Index: branches/5.3.x/install/upgrades.php =================================================================== diff -u -N -r15696 -r15900 --- branches/5.3.x/install/upgrades.php (.../upgrades.php) (revision 15696) +++ branches/5.3.x/install/upgrades.php (.../upgrades.php) (revision 15900) @@ -1,6 +1,6 @@ Array ('Core' => '5.2.0-RC1'), '5.2.0' => Array ('Core' => '5.2.0'), '5.2.1-B1' => Array ('Core' => '5.2.1-B1'), + '5.2.1-B2' => Array ('Core' => '5.2.1-B2'), + '5.2.1-RC1' => Array ('Core' => '5.2.1-RC1'), ); } Index: branches/5.3.x/units/links/links_config.php =================================================================== diff -u -N -r15672 -r15900 --- branches/5.3.x/units/links/links_config.php (.../links_config.php) (revision 15672) +++ branches/5.3.x/units/links/links_config.php (.../links_config.php) (revision 15900) @@ -1,6 +1,6 @@ 0, + 'CheckSimulatniousEdit' => true, + 'RewritePriority' => 101, 'RewriteListener' => 'CategoryItemRewrite:RewriteListener', @@ -426,9 +428,9 @@ '' => ' SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId + {PERM_JOIN} LEFT JOIN '.TABLE_PREFIX.'Categories ON '.TABLE_PREFIX.'Categories.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId - LEFT JOIN '.TABLE_PREFIX.'%3$sCatalogImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1 - LEFT JOIN '.TABLE_PREFIX.'CategoryPermissionsCache perm ON perm.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId + LEFT JOIN '.TABLE_PREFIX.'%3$sCatalogImages img ON img.ResourceId = %1$s.ResourceId AND img.DefaultImg = 1 LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.CreatedById = u.PortalUserId LEFT JOIN '.TABLE_PREFIX.'%3$sLinkCustomData cust ON %1$s.ResourceId = cust.ResourceId', ), Index: branches/5.3.x/install.php =================================================================== diff -u -N -r15486 -r15900 --- branches/5.3.x/install.php (.../install.php) (revision 15486) +++ branches/5.3.x/install.php (.../install.php) (revision 15900) @@ -1,6 +1,6 @@ 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(); - $category =& $toolkit->createModuleCategory('Directory', 'Link Directory', '#in-link/section_design#', 'in-link/img/menu_links.gif'); +if ( $application->RecallVar('user_id') != USER_ROOT ) { + die('restricted access!'); +} - $toolkit->RunSQL('/' . $module_folder . '/install/install_schema.sql'); - $toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql', '{LinkCatId}', $category->GetID()); - $toolkit->ImportLanguage('/' . $module_folder . '/install/english'); +$category =& $toolkit->createModuleCategory('Directory', 'Link Directory', '#in-link/section_design#', 'in-link/img/menu_links.gif'); - $toolkit->SetModuleRootCategory(basename($module_folder), $category->GetID()); +$toolkit->RunSQL('/' . $module_folder . '/install/install_schema.sql'); +$toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql', '{LinkCatId}', $category->GetID()); +$toolkit->ImportLanguage('/' . $module_folder . '/install/english'); - $toolkit->linkCustomFields(basename($module_folder), 'l', 4); // to create Custom Fields for Links - $toolkit->linkCustomFields('KERNEL', 'c', 1); // to create ItemTemplate custom field - $toolkit->setModuleItemTemplate($category, 'l', '#in-link/item_design#'); +$toolkit->SetModuleRootCategory(basename($module_folder), $category->GetID()); - $toolkit->finalizeModuleInstall($module_folder, true); \ No newline at end of file +$toolkit->linkCustomFields(basename($module_folder), 'l', 4); // to create Custom Fields for Links +$toolkit->linkCustomFields('KERNEL', 'c', 1); // to create ItemTemplate custom field +$toolkit->setModuleItemTemplate($category, 'l', '#in-link/item_design#'); + +$toolkit->finalizeModuleInstall($module_folder, true);