From 7fcc35c32266cfde374bb86567f8e5b841af6d38 Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Mon, 17 Jan 2011 16:16:15 +0000
Subject: [PATCH] Revert r7698 and r7699; when displaying an old version of a
 page, the version got transferred to included pages

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@7839 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/plugin/IncludePage.php     | 7 -------
 lib/plugin/Template.php        | 7 -------
 pgsrc/Help%2FIncludePagePlugin | 6 +-----
 pgsrc/Help%2FTemplatePlugin    | 6 +-----
 4 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/lib/plugin/IncludePage.php b/lib/plugin/IncludePage.php
index 8f9c1c80d..f8c8b02d3 100644
--- a/lib/plugin/IncludePage.php
+++ b/lib/plugin/IncludePage.php
@@ -41,7 +41,6 @@ extends WikiPlugin
     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 @@ extends WikiPlugin
         $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);
diff --git a/lib/plugin/Template.php b/lib/plugin/Template.php
index 97b4ba6dd..559b9a3ac 100644
--- a/lib/plugin/Template.php
+++ b/lib/plugin/Template.php
@@ -70,7 +70,6 @@ extends WikiPlugin
                      '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 @@ extends WikiPlugin
         $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);
diff --git a/pgsrc/Help%2FIncludePagePlugin b/pgsrc/Help%2FIncludePagePlugin
index 6f2a5597e..d78edb3f8 100644
--- a/pgsrc/Help%2FIncludePagePlugin
+++ b/pgsrc/Help%2FIncludePagePlugin
@@ -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 pages will render in distinct tables. You can also load external pages in a
 | the revision
 | most recent revision
 |-
-| **version**
-| page revision (same as ##rev##)
-| most recent revision
-|-
 | **quiet**
 | if set, inclusion appears as normal content
 | false
diff --git a/pgsrc/Help%2FTemplatePlugin b/pgsrc/Help%2FTemplatePlugin
index 106f595a3..2a1b1b8b7 100644
--- a/pgsrc/Help%2FTemplatePlugin
+++ b/pgsrc/Help%2FTemplatePlugin
@@ -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 @@ Short syntax:
 | page revision
 | most recent revision
 |-
-| **version**
-| page revision (same as ##rev##)
-| most recent revision
-|-
 | **section**
 | just include a named section
 | (empty)
-- 
2.45.0