Changeset 1289

Timestamp:

12/12/08 06:11:05 (3 years ago)

Author:

SvenDowideit

Message:

Item41: remove the duplicate TAG topics - VarSERVERTIME

Location:

trunk/core

Files:

• data/System/VarSERVERTIME.txt (modified) (1 diff)
• data/System/VarSERVERTIME2.txt (deleted)
• lib/Foswiki/Contrib/core/MANIFEST (modified) (1 diff)

trunk/core/data/System/VarSERVERTIME.txt

@@ -2 +2 @@
 %META:TOPICPARENT{name="Macros"}%
 #VarSERVERTIME
----+++ SERVERTIME -- server time
-   * Syntax: =%<nop>SERVERTIME%=
-   * Expands to: =%SERVERTIME%=
-   * Date format defined as {DefaultDateFormat} in [[%SCRIPTURLPATH{"configure"}%][configure]]
+---+++ SERVERTIME{"format"} -- formatted server time
+   * Same format qualifiers as =%<nop>GMTIME%=
+   * Syntax: =%<nop>SERVERTIME%= OR =%<nop>SERVERTIME{"format"}%=
+   * =%<nop>SERVERTIME%= uses the Date format defined as {DefaultDateFormat} in [[%SCRIPTURLPATH{"configure"}%][configure]]
+   * Example: =%<nop>SERVERTIME{"$hou:$min"}%= expands to =%SERVERTIME{"$hou:$min"}%=
    * __%X% Note:__ When used in a template topic, this macro will be expanded when the template is used to create a new topic. See TemplateTopics#TemplateTopicsVars for details.
-   * Related: [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarDISPLAYTIME][DISPLAYTIME]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarGMTIME][GMTIME]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSERVERTIME2][SERVERTIME{"format"}]]
-
+   * Related: [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarGMTIME][GMTIME]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSERVERTIME][SERVERTIME]]

trunk/core/lib/Foswiki/Contrib/core/MANIFEST

@@ -254 +254 @@
 data/System/VarSEARCH.txt 0644
 data/System/VarSERVERTIME.txt 0644
-data/System/VarSERVERTIME2.txt 0644
 data/System/VarSESSIONID.txt 0644
 data/System/VarSESSIONVAR.txt 0644