Index: branches/5.2.x/core/admin_templates/config/config_universal.tpl
===================================================================
diff -u -N -r14244 -r14637
--- branches/5.2.x/core/admin_templates/config/config_universal.tpl (.../config_universal.tpl) (revision 14244)
+++ branches/5.2.x/core/admin_templates/config/config_universal.tpl (.../config_universal.tpl) (revision 14637)
@@ -96,7 +96,9 @@
+
+
Index: branches/5.2.x/core/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r14629 -r14637
--- branches/5.2.x/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 14629)
+++ branches/5.2.x/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 14637)
@@ -1,6 +1,6 @@
Application->UnitConfigReader->configData as $prefix => $config_data) {
$ml_helper->createFields($prefix);
}
+
+ $event->SetRedirectParam('action_completed', 1);
}
/**
Index: branches/5.2.x/core/units/admin/admin_events_handler.php
===================================================================
diff -u -N -r14609 -r14637
--- branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 14609)
+++ branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 14637)
@@ -1,6 +1,6 @@
Conn->Query('DELETE FROM ' . TABLE_PREFIX . 'CachedUrls');
+
+ $event->SetRedirectParam('action_completed', 1);
}
/**
@@ -122,6 +124,7 @@
}
$event->SetRedirectParam('refresh_tree', 1);
+ $event->SetRedirectParam('action_completed', 1);
}
function OnResetConfigsCache(&$event)
@@ -161,6 +164,8 @@
if ( $this->Application->GetVar('validate_configs') ) {
$event->SetRedirectParam('validate_configs', 1);
}
+
+ $event->SetRedirectParam('action_completed', 1);
}
function OnResetMemcache(&$event)
@@ -170,6 +175,7 @@
}
$this->Application->resetCache();
+ $event->SetRedirectParam('action_completed', 1);
}
function OnCompileTemplates(&$event)
@@ -188,37 +194,44 @@
*/
function OnDeleteCompiledTemplates(&$event)
{
- if ($this->Application->GetVar('ajax') == 'yes') {
+ if ( $this->Application->GetVar('ajax') == 'yes' ) {
$event->status = kEvent::erSTOP;
}
$base_path = WRITEABLE . DIRECTORY_SEPARATOR . 'cache';
// delete debugger reports
- $debugger_reports = glob($base_path . '/debug_@*@.txt');
+ $debugger_reports = glob(RESTRICTED . '/debug_@*@.txt');
- foreach ($debugger_reports as $debugger_report) {
- unlink($debugger_report);
+ if ( $debugger_reports ) {
+ foreach ($debugger_reports as $debugger_report) {
+ unlink($debugger_report);
+ }
}
$this->_deleteCompiledTemplates($base_path);
+ $event->SetRedirectParam('action_completed', 1);
}
function _deleteCompiledTemplates($folder, $unlink_folder = false)
{
$sub_folders = glob($folder . '/*', GLOB_ONLYDIR);
- foreach ($sub_folders as $sub_folder) {
- $this->_deleteCompiledTemplates($sub_folder, true);
+ if ( is_array($sub_folders) ) {
+ foreach ($sub_folders as $sub_folder) {
+ $this->_deleteCompiledTemplates($sub_folder, true);
+ }
}
$files = glob($folder . '/*.php');
- foreach ($files as $file) {
- unlink($file);
+ if ( is_array($files) ) {
+ foreach ($files as $file) {
+ unlink($file);
+ }
}
- if ($unlink_folder) {
+ if ( $unlink_folder ) {
rmdir($folder);
}
}
@@ -407,6 +420,8 @@
/* @var $themes_helper kThemesHelper */
$themes_helper->refreshThemes();
+
+ $event->SetRedirectParam('action_completed', 1);
}
function OnSaveColumns(&$event)
@@ -1368,6 +1383,8 @@
/* @var $deployment_helper DeploymentHelper */
$deployment_helper->deployAll();
+
+ $event->SetRedirectParam('action_completed', 1);
}
/**
@@ -1383,6 +1400,9 @@
if ( !$deployment_helper->deployAll(true) ) {
$event->status = kEvent::erFAIL;
}
+ else {
+ $event->SetRedirectParam('action_completed', 1);
+ }
}
}
Index: branches/5.2.x/core/units/configuration/configuration_event_handler.php
===================================================================
diff -u -N -r14628 -r14637
--- branches/5.2.x/core/units/configuration/configuration_event_handler.php (.../configuration_event_handler.php) (revision 14628)
+++ branches/5.2.x/core/units/configuration/configuration_event_handler.php (.../configuration_event_handler.php) (revision 14637)
@@ -1,6 +1,6 @@
Application->StoreVar('config_was_updated', 1);
}
/**
Index: branches/5.2.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r14621 -r14637
--- branches/5.2.x/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 14621)
+++ branches/5.2.x/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 14637)
@@ -99,10 +99,10 @@
-
+
id="">
- |
+ |
|
Index: branches/5.2.x/core/install/upgrades.css
===================================================================
diff -u -N -r14598 -r14637
--- branches/5.2.x/core/install/upgrades.css (.../upgrades.css) (revision 14598)
+++ branches/5.2.x/core/install/upgrades.css (.../upgrades.css) (revision 14637)
@@ -709,3 +709,23 @@
/* Column titles row */
tr.grid-header-row-0 td {
height: 25px;
+@@ -493,11 +516,18 @@
+ border-top-width: 0px;
+ }
+
++.form-notice, .form-warning {
++ font-size: 11px;
++}
++
+ .form-warning {
+ color: red;
+- font-size: 11px;
+ }
+
++.form-notice {
++ color: green;
++}
++
+ .priority {
+ color: red;
+ padding-left: 1px;
Index: branches/5.2.x/core/install/english.lang
===================================================================
diff -u -N -r14635 -r14637
--- branches/5.2.x/core/install/english.lang (.../english.lang) (revision 14635)
+++ branches/5.2.x/core/install/english.lang (.../english.lang) (revision 14637)
@@ -694,8 +694,10 @@
U2VjdGlvbiBwYXRoIGluIG9uZSBmaWVsZA==
TW9kdWxlIG5vdCBsaWNlbnNlZA==
TW9uZGF5
+ TGFzdCBvcGVyYXRpb24gaGFzIGJlZW4gc3VjY2Vzc2Z1bGx5IGNvbXBsZXRlZCE=
QXBwbHkgdG8gYWxsIFN1Yi1zZWN0aW9ucz8=
WW91ciAicm9vdCIgcGFzc3dvcmQgaGFzIGJlZW4gcmVzZXQuIFBsZWFzZSByZW1vdmUgREJHX1JFU0VUX1JPT1QgY29uc3RhbnQgYW5kIGNoZWNrIHlvdXIgZS1tYWlsIGFkZHJlc3Mu
+ WW91ciBjaGFuZ2VzIHdlcmUgc3VjY2Vzc2Z1bGx5IHNhdmVkIQ==
TmV2ZXI=
TmV2ZXIgRXhwaXJlcw==
TmV3
Index: branches/5.2.x/core/admin_templates/config/config_search.tpl
===================================================================
diff -u -N -r14244 -r14637
--- branches/5.2.x/core/admin_templates/config/config_search.tpl (.../config_search.tpl) (revision 14244)
+++ branches/5.2.x/core/admin_templates/config/config_search.tpl (.../config_search.tpl) (revision 14637)
@@ -125,6 +125,10 @@
+
+
+
+
style="border-bottom-width: 0px;">