Index: branches/5.2.x/core/install/install_data.sql
===================================================================
diff -u -N -r15042 -r15051
--- branches/5.2.x/core/install/install_data.sql (.../install_data.sql) (revision 15042)
+++ branches/5.2.x/core/install/install_data.sql (.../install_data.sql) (revision 15051)
@@ -77,6 +77,7 @@
INSERT INTO SystemSettings VALUES(DEFAULT, 'HTTPAuthUsername', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsAdmin', 'la_config_HTTPAuthUsername', 'text', '', '', 40.16, 0, 0, NULL);
INSERT INTO SystemSettings VALUES(DEFAULT, 'HTTPAuthPassword', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsAdmin', 'la_config_HTTPAuthPassword', 'password', NULL, NULL, 40.17, 0, 0, NULL);
INSERT INTO SystemSettings VALUES(DEFAULT, 'HTTPAuthBypassIPs', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsAdmin', 'la_config_HTTPAuthBypassIPs', 'text', '', '', 40.18, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'EnablePageContentRevisionControl', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsAdmin', 'la_config_EnablePageContentRevisionControl', 'checkbox', '', '', 40.19, 0, 0, NULL);
INSERT INTO SystemSettings VALUES(DEFAULT, 'Smtp_Server', NULL, 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_prompt_mailserver', 'text', NULL, NULL, 50.01, 0, 1, NULL);
INSERT INTO SystemSettings VALUES(DEFAULT, 'Smtp_Port', NULL, 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_prompt_mailport', 'text', NULL, NULL, 50.02, 0, 1, NULL);
INSERT INTO SystemSettings VALUES(DEFAULT, 'Smtp_Authenticate', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsMailling', 'la_prompt_mailauthenticate', 'checkbox', NULL, NULL, 50.03, 0, 1, NULL);
Index: branches/5.2.x/core/admin_templates/categories/edit_content.tpl
===================================================================
diff -u -N -r15042 -r15051
--- branches/5.2.x/core/admin_templates/categories/edit_content.tpl (.../edit_content.tpl) (revision 15042)
+++ branches/5.2.x/core/admin_templates/categories/edit_content.tpl (.../edit_content.tpl) (revision 15051)
@@ -73,32 +73,34 @@
}
);
- setInterval(
- function () {
- var $editor_instance = CKEDITOR.instances[ '' ];
- $('#' + jq('')).val( $editor_instance.getData() );
+
+ setInterval(
+ function () {
+ var $editor_instance = CKEDITOR.instances[ '' ];
+ $('#' + jq('')).val( $editor_instance.getData() );
- submit_event_ajax(
- 'content', 'OnAutoSave', undefined,
- function ($autosave_string) {
- $('#blue_bar').html( $autosave_title.replace('%s', $autosave_string) );
- }
- );
- }, * 1000
- );
-
- setInterval(
- function () {
- submit_event_ajax(
- 'content', 'OnGetAutoSaveTime', undefined,
- function ($autosave_string) {
- if ( $autosave_string ) {
+ submit_event_ajax(
+ 'content', 'OnAutoSave', undefined,
+ function ($autosave_string) {
$('#blue_bar').html( $autosave_title.replace('%s', $autosave_string) );
}
- }
- );
- }, * 1000
- );
+ );
+ }, * 1000
+ );
+
+ setInterval(
+ function () {
+ submit_event_ajax(
+ 'content', 'OnGetAutoSaveTime', undefined,
+ function ($autosave_string) {
+ if ( $autosave_string ) {
+ $('#blue_bar').html( $autosave_title.replace('%s', $autosave_string) );
+ }
+ }
+ );
+ }, * 1000
+ );
+
\ No newline at end of file
Index: branches/5.2.x/core/units/content/content_eh.php
===================================================================
diff -u -N -r15049 -r15051
--- branches/5.2.x/core/units/content/content_eh.php (.../content_eh.php) (revision 15049)
+++ branches/5.2.x/core/units/content/content_eh.php (.../content_eh.php) (revision 15051)
@@ -1,6 +1,6 @@
Load( $object->GetDBField('RevisionId') );
- if ( !$revision->GetDBField('IsDraft') ) {
+ if ( $this->Application->ConfigValue('EnablePageContentRevisionControl') && !$revision->GetDBField('IsDraft') ) {
// editing live revision of a page's content block -> get draft for current user and page
$load_keys = Array (
'PageId' => $revision->GetDBField('PageId'),
Index: branches/5.2.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r15012 -r15051
--- branches/5.2.x/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 15012)
+++ branches/5.2.x/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 15051)
@@ -1,6 +1,6 @@
-
+ ';
- ' . "\n";
+ ' . $publishing_tools . '
+ ' . "\n";
+ }
}
$edit_code .= '' . $edit_btn . '
';
Index: branches/5.2.x/core/units/page_revisions/page_revision_eh.php
===================================================================
diff -u -N -r15042 -r15051
--- branches/5.2.x/core/units/page_revisions/page_revision_eh.php (.../page_revision_eh.php) (revision 15042)
+++ branches/5.2.x/core/units/page_revisions/page_revision_eh.php (.../page_revision_eh.php) (revision 15051)
@@ -37,7 +37,7 @@
/* @var $perm_helper kPermissionsHelper */
if ( $event->Name == 'OnSave' ) {
- $perm_status = $this->Application->CheckPermission('CATEGORY.REVISION.ADD', 0) || $this->Application->CheckPermission('CATEGORY.REVISION.ADD.PENDING', 0);
+ $perm_status = $this->Application->CheckPermission('CATEGORY.REVISION.ADD', 0) || $this->Application->CheckPermission('CATEGORY.REVISION.ADD.PENDING', 0);
return $perm_helper->finalizePermissionCheck($event, $perm_status);
}
@@ -218,7 +218,7 @@
}
/**
- * Returns user, who are edting current page right now
+ * Returns user, who are editing current page right now
*
* @param kEvent $event
*/
Index: branches/5.2.x/core/install/upgrades.sql
===================================================================
diff -u -N -r15042 -r15051
--- branches/5.2.x/core/install/upgrades.sql (.../upgrades.sql) (revision 15042)
+++ branches/5.2.x/core/install/upgrades.sql (.../upgrades.sql) (revision 15051)
@@ -2601,3 +2601,5 @@
INSERT INTO SystemSettings VALUES(DEFAULT, 'CKFinderLicenseName', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_Settings3rdPartyAPI', 'la_config_CKFinderLicenseName', 'text', NULL, NULL, 80.03, 0, 0, NULL);
INSERT INTO SystemSettings VALUES(DEFAULT, 'CKFinderLicenseKey', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_Settings3rdPartyAPI', 'la_config_CKFinderLicenseKey', 'text', NULL, NULL, 80.04, 0, 0, NULL);
+
+INSERT INTO SystemSettings VALUES(DEFAULT, 'EnablePageContentRevisionControl', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsAdmin', 'la_config_EnablePageContentRevisionControl', 'checkbox', '', '', 40.19, 0, 0, NULL);
Index: branches/5.2.x/core/install/english.lang
===================================================================
diff -u -N -r15042 -r15051
--- branches/5.2.x/core/install/english.lang (.../english.lang) (revision 15042)
+++ branches/5.2.x/core/install/english.lang (.../english.lang) (revision 15051)
@@ -157,6 +157,7 @@
RGVmYXVsdCBFLW1haWwgUmVjaXBpZW50cw==
RGVmYXVsdCBSZWdpc3RyYXRpb24gQ291bnRyeQ==
RGVmYXVsdCBBbmFseXRpY3MgVHJhY2tpbmcgQ29kZQ==
+
RW5hYmxlIFJldmlzaW9uIENvbnRyb2wgZm9yIFNlY3Rpb24gQ29udGVudA==
VGVtcGxhdGUgZm9yICJGaWxlIG5vdCBmb3VuZCAoNDA0KSIgRXJyb3I=
RXhjbHVkZSB0ZW1wbGF0ZSBiYXNlZCBTZWN0aW9ucyBmcm9tIFNlYXJjaCBSZXN1bHRzIChpZS4gVXNlciBSZWdpc3RyYXRpb24p
RmlsZW5hbWUgU3BlY2lhbCBDaGFyIFJlcGxhY2VtZW50