Index: branches/5.2.x/core/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r14585 -r14588
--- branches/5.2.x/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 14585)
+++ branches/5.2.x/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 14588)
@@ -1,6 +1,6 @@
status == erSUCCESS) {
+ if ($event->status == kEvent::erSUCCESS) {
// keep "Section Properties" link (in browse modes) clean
$this->Application->DeleteVar('admin');
}
Index: branches/5.2.x/core/install/upgrades.php
===================================================================
diff -u -N -r14585 -r14588
--- branches/5.2.x/core/install/upgrades.php (.../upgrades.php) (revision 14585)
+++ branches/5.2.x/core/install/upgrades.php (.../upgrades.php) (revision 14588)
@@ -1,6 +1,6 @@
Application->recallObject('kMultiLanguageHelper');
/* @var $ml_helper kMultiLanguageHelper */
- $ml_helper->createFields('phrases');
-
$delete_ids = Array ();
- $language_count = $ml_helper->getLanguageCount();
+ $ml_helper->createFields('phrases');
+ $languages = $ml_helper->getLanguages();
foreach ($column_phrases as $phrase_key => $phrase_info) {
$field_phrase_key = 'LA_FLD_' . substr($phrase_key, 7);
@@ -1796,12 +1795,8 @@
$fields_hash = Array ();
// copy column phrase main translation into field phrase column translation
- for ($i = 1; $i <= $language_count; $i++) {
- if ( !$ml_helper->LanguageFound($i) ) {
- continue;
- }
-
- $fields_hash['l' . $i . '_ColumnTranslation'] = $phrase_info['l' . $i . '_Translation'];
+ foreach ($languages as $language_id) {
+ $fields_hash['l' . $language_id . '_ColumnTranslation'] = $phrase_info['l' . $language_id . '_Translation'];
}
$delete_ids[] = $phrase_info['PhraseId'];
Index: branches/5.2.x/core/kernel/startup.php
===================================================================
diff -u -N -r14585 -r14588
--- branches/5.2.x/core/kernel/startup.php (.../startup.php) (revision 14585)
+++ branches/5.2.x/core/kernel/startup.php (.../startup.php) (revision 14588)
@@ -1,6 +1,6 @@
DestinationPath;
@@ -355,6 +355,6 @@
return ' width="'.$image_info[0].'" height="'.$image_info[1].'"';
}
- return parent::GetFormatted($value, $field_name, $object, $format);
+ return parent::GetFormatted($value, $field_name, $object, $format, $force_direct_links);
}
}
\ No newline at end of file
Index: branches/5.2.x/core/kernel/application.php
===================================================================
diff -u -N -r14585 -r14588
--- branches/5.2.x/core/kernel/application.php (.../application.php) (revision 14585)
+++ branches/5.2.x/core/kernel/application.php (.../application.php) (revision 14588)
@@ -1,6 +1,6 @@
GetVar('ajax') == 'yes' && !$this->GetVar('debug_ajax')) {
// hide debug output from ajax requests automatically
- safeDefine('DBG_SKIP_REPORTING', 1); // safeDefine, because debugger also defines it
+ kUtil::safeDefine('DBG_SKIP_REPORTING', 1); // safeDefine, because debugger also defines it
}
}
elseif ($this->GetVar('admin')) {
@@ -1542,7 +1542,7 @@
else {
if ($this->GetVar('ajax') == 'yes' && $t != $this->GetVar('t')) {
// redirection to other then current template during ajax request
- safeDefine('DBG_SKIP_REPORTING', 1);
+ kUtil::safeDefine('DBG_SKIP_REPORTING', 1);
echo '#redirect#' . $location;
}
elseif (headers_sent() != '') {
@@ -2048,6 +2048,7 @@
* Handles exception
*
* @param Exception $exception
+ * @return bool
*/
function handleException($exception)
{
Index: branches/5.2.x/core/units/helpers/xml_helper.php
===================================================================
diff -u -N -r14244 -r14588
--- branches/5.2.x/core/units/helpers/xml_helper.php (.../xml_helper.php) (revision 14244)
+++ branches/5.2.x/core/units/helpers/xml_helper.php (.../xml_helper.php) (revision 14588)
@@ -1,6 +1,6 @@
Mode = !isset($mode) ? XML_NO_TEXT_NODES : $mode;
+ $this->Mode = !isset($mode) ? self::XML_NO_TEXT_NODES : $mode;
$this->Clear(); // in case if Parse method is called more then one time
$xml_parser = xml_parser_create();
Index: branches/5.2.x/core/units/agents/agent_eh.php
===================================================================
diff -u -N -r14244 -r14588
--- branches/5.2.x/core/units/agents/agent_eh.php (.../agent_eh.php) (revision 14244)
+++ branches/5.2.x/core/units/agents/agent_eh.php (.../agent_eh.php) (revision 14588)
@@ -1,6 +1,6 @@
TableName . '.' . $object->IDField . ' IN (' . implode(',', $ids) . ')',
$object->TableName . '.Status = ' . STATUS_ACTIVE,
- $object->TableName . '.LastRunStatus <> ' . AGENT_LAST_RUN_RUNNING,
+ $object->TableName . '.LastRunStatus <> ' . Agent::LAST_RUN_RUNNING,
);
$sql = $object->GetSelectSQL() . '
Index: branches/5.2.x/core/kernel/utility/formatters/multilang_formatter.php
===================================================================
diff -u -N -r14585 -r14588
--- branches/5.2.x/core/kernel/utility/formatters/multilang_formatter.php (.../multilang_formatter.php) (revision 14585)
+++ branches/5.2.x/core/kernel/utility/formatters/multilang_formatter.php (.../multilang_formatter.php) (revision 14588)
@@ -1,6 +1,6 @@
setRequired($field_name, false);
- unset($fields[$field_name]['required']);
+ $object_fields = $object->getFields(); // use kDBBase::getFields, since there are no kDBList::setRequired
+ unset($fields[$field_name]['required'], $object_fields[$field_name]['required']);
+ $object->setFields($object_fields);
// prevents real field with formatter set to be saved in db
- $virtual_fields[$field_name] = $object->GetFieldOptions($field_name);
- $object->SetFieldOptions($field_name, $virtual_fields[$field_name], true);
+ $virtual_fields[$field_name] = $object_fields[$field_name];
+ $object->SetFieldOptions($field_name, $object_fields[$field_name], true);
}
elseif (array_key_exists($field_name, $virtual_fields)) {
// substitude virtual field
@@ -168,9 +169,10 @@
$this->Application->setUnitOption($object->Prefix, 'CalculatedFields', $calculated_fields);
// makes original field non-required
- $object->setRequired($field_name, false);
- unset($fields[$field_name]['required']);
-
+ $object_fields = $object->getFields(); // use kDBBase::getFields, since there are no kDBList::setRequired
+ unset($fields[$field_name]['required'], $object_fields[$field_name]['required']);
+ $object->setFields($object_fields);
+
$virtual_field_options = $object->GetFieldOptions($field_name, true);
unset($virtual_fields[$field_name]['required'], $virtual_field_options['required']);
$object->SetFieldOptions($field_name, $virtual_field_options, true);
Index: branches/5.2.x/core/units/admin/admin_events_handler.php
===================================================================
diff -u -N -r14585 -r14588
--- branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 14585)
+++ branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 14588)
@@ -1,6 +1,6 @@
Application->GetVar('ajax') == 'yes') {
- $event->status = erSTOP;
+ $event->status = kEvent::erSTOP;
}
$this->Application->DeleteUnitCache();
@@ -1345,7 +1345,7 @@
{
if ( isset($GLOBALS['argv']) ) {
// command line invocation -> don't perform redirect
- $event->status = erSTOP;
+ $event->status = kEvent::erSTOP;
}
$deployment_helper =& $this->Application->recallObject('DeploymentHelper');
@@ -1365,7 +1365,7 @@
/* @var $deployment_helper DeploymentHelper */
if ( !$deployment_helper->deployAll(true) ) {
- $event->status = erFAIL;
+ $event->status = kEvent::erFAIL;
}
}
}
Index: branches/5.2.x/core/install/english.lang
===================================================================
diff -u -N -r14585 -r14588
--- branches/5.2.x/core/install/english.lang (.../english.lang) (revision 14585)
+++ branches/5.2.x/core/install/english.lang (.../english.lang) (revision 14588)
@@ -538,7 +538,7 @@
UnVsZSBUeXBl
UnVuIEludGVydmFs
UnVuIE1vZGU=
- UnVuIFRpbWU=
+ UnVuIFRpbWU=
U2FtZSBBcyBUaHVtYg==
U2VhcmNoIFRlcm0=
U2VuZGVyJ3MgQWRkcmVzcw==