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

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

Revision: 7839
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7839&view=rev
Author:   vargenau
Date:     2011-01-17 16:16:15 +0000 (Mon, 17 Jan 2011)

Log Message:
-----------
Revert r7698 and r7699; when displaying an old version of a page, the version got transferred to included pages

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

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2011-01-17 14:47:32 UTC (rev 7838)
+++ trunk/lib/plugin/IncludePage.php	2011-01-17 16:16:15 UTC (rev 7839)
@@ -41,7 +41,6 @@
     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
@@ -70,12 +69,6 @@
         $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/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2011-01-17 14:47:32 UTC (rev 7838)
+++ trunk/lib/plugin/Template.php	2011-01-17 16:16:15 UTC (rev 7839)
@@ -70,7 +70,6 @@
                      '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
                      );
@@ -100,12 +99,6 @@
         $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);

Modified: trunk/pgsrc/Help%2FIncludePagePlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludePagePlugin	2011-01-17 14:47:32 UTC (rev 7838)
+++ trunk/pgsrc/Help%2FIncludePagePlugin	2011-01-17 16:16:15 UTC (rev 7839)
@@ -1,4 +1,4 @@
-Date: Mon, 20 Sep 2010 16:44:13 +0000
+Date: Mon, 17 Jan 2011 17:13:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -33,10 +33,6 @@
 | the revision
 | most recent revision
 |-
-| **version**
-| page revision (same as ##rev##)
-| most recent revision
-|-
 | **quiet**
 | if set, inclusion appears as normal content
 | false

Modified: trunk/pgsrc/Help%2FTemplatePlugin
===================================================================
--- trunk/pgsrc/Help%2FTemplatePlugin	2011-01-17 14:47:32 UTC (rev 7838)
+++ trunk/pgsrc/Help%2FTemplatePlugin	2011-01-17 16:16:15 UTC (rev 7839)
@@ -1,4 +1,4 @@
-Date: Fri, 20 Sep 2010 13:46:13 +0000
+Date: Mon, 17 Jan 2011 17:13:41 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -73,10 +73,6 @@
 | 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.