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

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

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

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

Modified Paths:
--------------
    trunk/lib/plugin/Template.php
    trunk/pgsrc/Help%2FTemplatePlugin

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2010-09-20 13:04:55 UTC (rev 7697)
+++ trunk/lib/plugin/Template.php	2010-09-20 13:28:46 UTC (rev 7698)
@@ -70,6 +70,7 @@
                      'page'    => false, // the page to include
                      'vars'    => false, // TODO: get rid of this, all remaining args should be vars
                      'rev'     => false, // the revision (defaults to most recent)
+                     'version' => false, // same as "rev"
                      'section' => false, // just include a named section
                      'sectionhead' => false // when including a named section show the heading
                      );
@@ -94,17 +95,24 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-            $this->vars = array();
+        $this->vars = array();
         $args = $this->getArgs($argstr, $request);
         $vars = $args['vars'] ? $args['vars'] : $this->vars;
         $page = $args['page'];
+
+        if ($args['version'] && $args['rev']) {
+            return $this->error(_("Choose only one of 'version' or 'rev' parameters."));
+        } elseif ($args['version']) {
+            $args['rev'] = $args['version'];
+        }
+
         if ($page) {
             // Expand relative page names.
             $page = new WikiPageName($page, $basepage);
             $page = $page->name;
         }
         if (!$page) {
-            return $this->error(_("no page specified"));
+            return $this->error(_("No page specified."));
         }
 
         // If "Template:$page" exists, use it
@@ -125,12 +133,12 @@
 
         // Check if page exists
         if (!($dbi->isWikiPage($page))) {
-            return $this->error(sprintf(_("Page '%s' does not exist"), $page));
+            return $this->error(sprintf(_("Page '%s' does not exist."), $page));
         }
 
         // Check if user is allowed to get the Page.
         if (!mayAccessPage ('view', $page)) {
-                return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
+                return $this->error(sprintf(_("Illegal inclusion of page %s: no read access."),
                                         $page));
         }
 
@@ -138,7 +146,7 @@
         if ($args['rev']) {
             $r = $p->getRevision($args['rev']);
             if (!$r) {
-                return $this->error(sprintf(_("%s(%d): no such revision"),
+                return $this->error(sprintf(_("%s(%d): no such revision."),
                                             $page, $args['rev']));
             }
         } else {

Modified: trunk/pgsrc/Help%2FTemplatePlugin
===================================================================
--- trunk/pgsrc/Help%2FTemplatePlugin	2010-09-20 13:04:55 UTC (rev 7697)
+++ trunk/pgsrc/Help%2FTemplatePlugin	2010-09-20 13:28:46 UTC (rev 7698)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Fri, 20 Sep 2010 13:46:13 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -73,6 +73,10 @@
 | page revision
 | most recent revision
 |-
+| **version**
+| page revision (same as ##rev##)
+| most recent revision
+|-
 | **section**
 | just include a named section
 | (empty)


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