[phpwiki-checkins] SF.net SVN: phpwiki:[10997] trunk/lib/plugin/Template.php

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

Revision: 10997
          http://sourceforge.net/p/phpwiki/code/10997
Author:   vargenau
Date:     2022-02-15 15:10:30 +0000 (Tue, 15 Feb 2022)
Log Message:
-----------
lib/plugin/Template.php: get code closer to lib/plugin/IncludePage.php

Modified Paths:
--------------
    trunk/lib/plugin/Template.php

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2022-02-15 15:07:16 UTC (rev 10996)
+++ trunk/lib/plugin/Template.php	2022-02-15 15:10:30 UTC (rev 10997)
@@ -112,6 +112,7 @@
         $args = $this->getArgs($argstr, $request);
         $vars = $args['vars'] ? $args['vars'] : $this->vars;
         $page = $args['page'];
+        $rev = $args['rev'];
 
         if ($page) {
             // Expand relative page names.
@@ -153,14 +154,14 @@
         }
 
         $p = $dbi->getPage($page);
-        if ($args['rev']) {
-            if (!is_whole_number($args['rev']) or !($args['rev'] > 0)) {
+        if ($rev) {
+            if (!is_whole_number($rev) or !($rev > 0)) {
                 return $this->error(_("Error: rev must be a positive integer."));
             }
-            $r = $p->getRevision($args['rev']);
+            $r = $p->getRevision($rev);
             if ((!$r) || ($r->hasDefaultContents())) {
                 return $this->error(sprintf(_("%s: no such revision %d."),
-                    $page, $args['rev']));
+                    $page, $rev));
             }
         } else {
             $r = $p->getCurrentRevision();

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