Index: branches/5.3.x/core/install/cache/class_structure.php
===================================================================
--- branches/5.3.x/core/install/cache/class_structure.php
+++ branches/5.3.x/core/install/cache/class_structure.php
@@ -156,6 +156,9 @@
'ReviewsTagProcessor' => '/core/units/reviews/reviews_tag_processor.php',
'ScheduledTask' => '/core/kernel/constants.php',
'ScheduledTaskEventHandler' => '/core/units/scheduled_tasks/scheduled_task_eh.php',
+ 'SecurityEncrypter' => '/core/kernel/security/SecurityEncrypter.php',
+ 'SecurityGenerator' => '/core/kernel/security/SecurityGenerator.php',
+ 'SecurityGeneratorPromise' => '/core/kernel/security/SecurityGeneratorPromise.php',
'SelectorsEventHandler' => '/core/units/selectors/selectors_event_handler.php',
'SelectorsItem' => '/core/units/selectors/selectors_item.php',
'SelectorsTagProcessor' => '/core/units/selectors/selectors_tag_processor.php',
@@ -1326,6 +1329,21 @@
0 => 'kDBEventHandler',
),
),
+ 'SecurityEncrypter' => array(
+ 'type' => 1,
+ 'modifiers' => 0,
+ 'extends' => array(
+ 0 => 'kBase',
+ ),
+ ),
+ 'SecurityGenerator' => array(
+ 'type' => 1,
+ 'modifiers' => 2,
+ ),
+ 'SecurityGeneratorPromise' => array(
+ 'type' => 1,
+ 'modifiers' => 2,
+ ),
'SelectorsEventHandler' => array(
'type' => 1,
'modifiers' => 0,
Index: branches/5.3.x/core/kernel/application.php
===================================================================
--- branches/5.3.x/core/kernel/application.php
+++ branches/5.3.x/core/kernel/application.php
@@ -730,11 +730,6 @@
$this->registerClass('Params', KERNEL_PATH . '/utility/params.php', 'kActions');
$this->registerClass('kMainTagProcessor', KERNEL_PATH . '/processors/main_processor.php', 'm_TagProcessor');
$this->registerClass('kEmailSendingHelper', KERNEL_PATH . '/utility/email_send.php', 'EmailSender');
-
- // security
- $this->registerClass('SecurityGenerator', KERNEL_PATH . '/security/SecurityGenerator.php');
- $this->registerClass('SecurityGeneratorPromise', KERNEL_PATH . '/security/SecurityGeneratorPromise.php');
- $this->registerClass('SecurityEncrypter', KERNEL_PATH . '/security/SecurityEncrypter.php');
}
/**
Index: branches/5.3.x/core/kernel/security/SecurityGeneratorPromise.php
===================================================================
--- branches/5.3.x/core/kernel/security/SecurityGeneratorPromise.php
+++ branches/5.3.x/core/kernel/security/SecurityGeneratorPromise.php
@@ -113,7 +113,7 @@
$application =& kApplication::Instance();
if ( $application->prefixRegistred($prefix_or_table) ) {
- $table = $application->getUnitOption($prefix_or_table, 'TableName');
+ $table = $application->getUnitConfig($prefix_or_table)->getTableName();
}
else {
$table = $prefix_or_table;