[phpwiki-checkins] SF.net SVN: phpwiki:[7700] trunk/lib/plugin

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

Revision: 7700
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7700&view=rev
Author:   vargenau
Date:     2010-09-20 16:03:26 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
Better test that a given revision exists

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

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2010-09-20 14:45:28 UTC (rev 7699)
+++ trunk/lib/plugin/IncludePage.php	2010-09-20 16:03:26 UTC (rev 7700)
@@ -107,8 +107,8 @@
         $p = $dbi->getPage($page);
         if ($rev) {
             $r = $p->getRevision($rev);
-            if (!$r) {
-                return $this->error(sprintf(_("%s(%d): no such revision"),
+            if ((!$r) || ($r->hasDefaultContents())) {
+                return $this->error(sprintf(_("%s: no such revision %d."),
                                             $page, $rev));
             }
         } else {

Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php	2010-09-20 14:45:28 UTC (rev 7699)
+++ trunk/lib/plugin/PageGroup.php	2010-09-20 16:03:26 UTC (rev 7700)
@@ -120,10 +120,9 @@
         $p = $dbi->getPage($parent);
         if ($rev) {
             $r = $p->getRevision($rev);
-            if (!$r) {
-                $this->error(sprintf(_("%s(%d): no such revision"), $parent,
-                                     $rev));
-                return '';
+            if ((!$r) || ($r->hasDefaultContents())) {
+                return $this->error(sprintf(_("%s: no such revision %d."),
+                                            $parent, $rev));
             }
         } else {
             $r = $p->getCurrentRevision();

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2010-09-20 14:45:28 UTC (rev 7699)
+++ trunk/lib/plugin/Template.php	2010-09-20 16:03:26 UTC (rev 7700)
@@ -145,8 +145,8 @@
         $p = $dbi->getPage($page);
         if ($args['rev']) {
             $r = $p->getRevision($args['rev']);
-            if (!$r) {
-                return $this->error(sprintf(_("%s(%d): no such revision."),
+            if ((!$r) || ($r->hasDefaultContents())) {
+                return $this->error(sprintf(_("%s: no such revision %d."),
                                             $page, $args['rev']));
             }
         } else {


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