Index: branches/5.3.x/install/upgrades.sql =================================================================== diff -u -N -r16370 -r16507 --- branches/5.3.x/install/upgrades.sql (.../upgrades.sql) (revision 16370) +++ branches/5.3.x/install/upgrades.sql (.../upgrades.sql) (revision 16507) @@ -206,6 +206,8 @@ # ===== v 5.2.1 ===== +# ===== v 5.2.2-B1 ===== + # ===== v 5.3.0-B1 ===== UPDATE Modules SET ClassNamespace = 'InPortal\\Modules\\InLink' Index: branches/5.3.x/install.php =================================================================== diff -u -N -r15900 -r16507 --- branches/5.3.x/install.php (.../install.php) (revision 15900) +++ branches/5.3.x/install.php (.../install.php) (revision 16507) @@ -1,6 +1,6 @@ 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->ImportLanguage('/' . $module_folder . '/install/english', isset($constants_file)); $toolkit->SetModuleRootCategory(basename($module_folder), $category->GetID()); Index: branches/5.3.x/units/link_validation/link_validation_eh.php =================================================================== diff -u -N -r16107 -r16507 --- branches/5.3.x/units/link_validation/link_validation_eh.php (.../link_validation_eh.php) (revision 16107) +++ branches/5.3.x/units/link_validation/link_validation_eh.php (.../link_validation_eh.php) (revision 16507) @@ -1,6 +1,6 @@ Load($id); switch ( $event->Name ) { case 'OnApproveLinks': - $ret = $object->ApproveChanges(); + $object->ApproveChanges(); break; case 'OnDeclineLinks': - $ret = $object->DeclineChanges(); + $object->DeclineChanges(); break; } - - if ( !$ret ) { - $event->status = kEvent::erFAIL; - $event->redirect = false; - break; - } } } @@ -582,4 +575,4 @@ )); } - } \ No newline at end of file + } Index: branches/5.3.x/units/listings/listings_event_handler.php =================================================================== diff -u -N -r16399 -r16507 --- branches/5.3.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 16399) +++ branches/5.3.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 16507) @@ -1,6 +1,6 @@ SetDBField('PendingRenewal', 0); if ( $object->Update() ) { - $event->status = kEvent::erSUCCESS; $event->SetRedirectParam('opener', 's'); $this->notifyOwner('LINK.ENHANCE.RENEW', $object); } - else { - $event->status = kEvent::erFAIL; - $event->redirect = false; - break; - } } else { $this->notifyOwner('LINK.ENHANCE.APPROVE', $object); Index: branches/5.3.x/install/upgrades.php =================================================================== diff -u -N -r16107 -r16507 --- branches/5.3.x/install/upgrades.php (.../upgrades.php) (revision 16107) +++ branches/5.3.x/install/upgrades.php (.../upgrades.php) (revision 16507) @@ -1,6 +1,6 @@ Array ('Core' => '5.2.1-B2'), '5.2.1-RC1' => Array ('Core' => '5.2.1-RC1'), '5.2.1' => Array ('Core' => '5.2.1'), + '5.2.2-B1' => Array ('Core' => '5.2.2-B1'), '5.3.0-B1' => Array ('Core' => '5.3.0-B1'), ); } @@ -182,4 +183,4 @@ } } } - } \ No newline at end of file + }