[phpwiki-checkins] SF.net SVN: phpwiki:[7699] trunk

[<var...@us...>]

Revision: 7699
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7699&view=rev
Author:   vargenau
Date:     2010-09-20 14:45:28 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
Add "version" as synonym of "rev"

Modified Paths:
--------------
    trunk/lib/plugin/IncludePage.php
    trunk/pgsrc/Help%2FIncludePagePlugin

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2010-09-20 13:28:46 UTC (rev 7698)
+++ trunk/lib/plugin/IncludePage.php	2010-09-20 14:45:28 UTC (rev 7699)
@@ -41,6 +41,7 @@
     function getDefaultArguments() {
         return array( 'page'    => false, // the page to include
                       'rev'     => false, // the revision (defaults to most recent)
+                      'version' => false, // same as "rev"
                       'quiet'   => false, // if set, inclusion appears as normal content
                       'bytes'   => false, // maximum number of bytes to include
                       'words'   => false, // maximum number of words to include
@@ -68,6 +69,13 @@
     function run($dbi, $argstr, &$request, $basepage) {
         $args = $this->getArgs($argstr, $request);
         extract($args);
+
+        if ($version && $rev) {
+            return $this->error(_("Choose only one of 'version' or 'rev' parameters."));
+        } elseif ($version) {
+            $rev = $version;
+        }
+
         if ($page) {
             // Expand relative page names.
             $page = new WikiPageName($page, $basepage);

Modified: trunk/pgsrc/Help%2FIncludePagePlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludePagePlugin	2010-09-20 13:28:46 UTC (rev 7698)
+++ trunk/pgsrc/Help%2FIncludePagePlugin	2010-09-20 14:45:28 UTC (rev 7699)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Mon, 20 Sep 2010 16:44:13 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -31,8 +31,12 @@
 |-
 | **rev**
 | the revision
-| defaults to most recent
+| most recent revision
 |-
+| **version**
+| page revision (same as ##rev##)
+| most recent revision
+|-
 | **quiet**
 | if set, inclusion appears as normal content
 | false


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.