Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[10424] trunk
|
From: <var...@us...> - 2021-08-04 10:45:04
|
Revision: 10424
http://sourceforge.net/p/phpwiki/code/10424
Author: vargenau
Date: 2021-08-04 10:45:01 +0000 (Wed, 04 Aug 2021)
Log Message:
-----------
Remove unused MAJOR_MIN_KEEP, MINOR_MIN_KEEP, MAJOR_MAX_AGE, MINOR_MAX_AGE, MAJOR_KEEP, MINOR_KEEP, AUTHOR_MAX_AGE, AUTHOR_MIN_AGE, AUTHOR_KEEP, AUTHOR_MAX_KEEP; we store all
Modified Paths:
--------------
trunk/config/config-default.ini
trunk/config/config-dist.ini
trunk/configurator.php
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2021-08-04 09:47:22 UTC (rev 10423)
+++ trunk/config/config-default.ini 2021-08-04 10:45:01 UTC (rev 10424)
@@ -65,20 +65,6 @@
DATABASE_OPTIMISE_FREQUENCY = 50
DATABASE_PERSISTENT = false
-; let all revisions be stored
-MAJOR_MIN_KEEP = 2147483647
-MINOR_MIN_KEEP = 2147483647
-; older fine-tuned settings for low-storage systems.
-; just comment the two lines above to enable it.
-MAJOR_MAX_AGE = 32
-MAJOR_KEEP = 8
-MINOR_MAX_AGE = 7
-MINOR_KEEP = 4
-AUTHOR_MAX_AGE = 365
-AUTHOR_KEEP = 8
-AUTHOR_MIN_AGE = 7
-AUTHOR_MAX_KEEP = 20
-
COOKIE_EXPIRATION_DAYS = 365
COOKIE_DOMAIN = "/"
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2021-08-04 09:47:22 UTC (rev 10423)
+++ trunk/config/config-dist.ini 2021-08-04 10:45:01 UTC (rev 10424)
@@ -168,7 +168,6 @@
; Default: false
;READONLY = true
-
;==========================================================================
; Part One: Authentication and security settings.
;
@@ -543,29 +542,7 @@
; revision with the content after the merged minor edit, the rest of
; the page metadata for the preceding version (summary, mtime, ...)
; is not changed.
-;
-; Let all revisions be stored. Default since 1.3.11
-;MAJOR_MIN_KEEP = 2147483647
-;MINOR_MIN_KEEP = 2147483647
-; Keep up to 8 major edits, but keep them no longer than a month.
-MAJOR_MAX_AGE = 32
-MAJOR_KEEP = 8
-
-; Keep up to 4 minor edits, but keep them no longer than a week.
-MINOR_MAX_AGE = 7
-MINOR_KEEP = 4
-
-; Keep the latest contributions of the last 8 authors up to a year.
-; Additionally, (in the case of a particularly active page) try to
-; keep the latest contributions of all authors in the last week (even
-; if there are more than eight of them,) but in no case keep more
-; than twenty unique author revisions.
-AUTHOR_MAX_AGE = 365
-AUTHOR_KEEP = 8
-AUTHOR_MIN_AGE = 7
-AUTHOR_MAX_KEEP = 20
-
;========================================================================
; Part Three: User Authentication
;========================================================================
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2021-08-04 09:47:22 UTC (rev 10423)
+++ trunk/configurator.php 2021-08-04 10:45:01 UTC (rev 10424)
@@ -793,102 +793,6 @@
$properties["USECACHE"] =
new boolean_define_commented_optional('USECACHE');
-///////////////////
-
-$properties["Page Revisions"] =
- new unchangeable_variable('_parttworevisions', "", "
-
-Section 2a: Archive Cleanup
-The next section controls how many old revisions of each page are kept in the database.
-
-There are two basic classes of revisions: major and minor. Which
-class a revision belongs in is determined by whether the author
-checked the \"this is a minor revision\" checkbox when they saved the
-page.
-
-There is, additionally, a third class of revisions: author
-revisions. The most recent non-mergable revision from each distinct
-author is and author revision.
-
-The expiry parameters for each of those three classes of revisions
-can be adjusted separately. For each class there are five
-parameters (usually, only two or three of the five are actually
-set) which control how long those revisions are kept in the
-database.
-<dl>
- <dt>max_keep:</dt> <dd>If set, this specifies an absolute maximum for the
- number of archived revisions of that class. This is
- meant to be used as a safety cap when a non-zero
- min_age is specified. It should be set relatively high,
- and it's purpose is to prevent malicious or accidental
- database overflow due to someone causing an
- unreasonable number of edits in a short period of time.</dd>
-
- <dt>min_age:</dt> <dd>Revisions younger than this (based upon the supplanted
- date) will be kept unless max_keep is exceeded. The age
- should be specified in days. It should be a
- non-negative, real number,</dd>
-
- <dt>min_keep:</dt> <dd>At least this many revisions will be kept.</dd>
-
- <dt>keep:</dt> <dd>No more than this many revisions will be kept.</dd>
-
- <dt>max_age:</dt> <dd>No revision older than this age will be kept.</dd>
-</dl>
-Supplanted date: Revisions are timestamped at the instant that they
-cease being the current revision. Revision age is computed using
-this timestamp, not the edit time of the page.
-
-Merging: When a minor revision is deleted, if the preceding
-revision is by the same author, the minor revision is merged with
-the preceding revision before it is deleted. Essentially: this
-replaces the content (and supplanted timestamp) of the previous
-revision with the content after the merged minor edit, the rest of
-the page metadata for the preceding version (summary, mtime, ...)
-is not changed.
-");
-
-// For now the expiration parameters are statically inserted as
-// an unchangeable property. You'll have to edit the resulting
-// config file if you really want to change these from the default.
-
-$properties["Major Edits: keep minimum days"] =
- new numeric_define('MAJOR_MIN_KEEP', MAJOR_MIN_KEEP, "
-Default: Keep for unlimited time.
-Set to 0 to enable archive cleanup");
-$properties["Minor Edits: keep minumum days"] =
- new numeric_define('MINOR_MIN_KEEP', MINOR_MIN_KEEP, "
-Default: Keep for unlimited time.
-Set to 0 to enable archive cleanup");
-
-$properties["Major Edits: how many"] =
- new numeric_define('MAJOR_KEEP', MAJOR_KEEP, "
-Keep up to 8 major edits");
-$properties["Major Edits: how many days"] =
- new numeric_define('MAJOR_MAX_AGE', MAJOR_MAX_AGE, "
-keep them no longer than a month");
-
-$properties["Minor Edits: how many"] =
- new numeric_define("MINOR_KEEP", MINOR_KEEP, "
-Keep up to 4 minor edits");
-$properties["Minor Edits: how many days"] =
- new numeric_define("MINOR_MAX_AGE", "7", "
-keep them no longer than a week");
-
-$properties["per Author: how many"] =
- new numeric_define("AUTHOR_KEEP", "8", "
-Keep the latest contributions of the last 8 authors,");
-$properties["per Author: how many days"] =
- new numeric_define("AUTHOR_MAX_AGE", "365", "
-up to a year.");
-$properties["per Author: keep minumum days"] =
- new numeric_define("AUTHOR_MIN_AGE", "7", "
-Additionally, (in the case of a particularly active page) try to
-keep the latest contributions of all authors in the last week (even if there are more than eight of them,)");
-$properties["per Author: max revisions"] =
- new numeric_define("AUTHOR_MAX_KEEP", "20", "
-but in no case keep more than twenty unique author revisions.");
-
/////////////////////////////////////////////////////////////////////
$properties["Part Three"] =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
