[phpwiki-checkins] SF.net SVN: phpwiki:[8174] trunk/lib/loadsave.php

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

Revision: 8174
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8174&view=rev
Author:   vargenau
Date:     2011-11-04 09:27:08 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Redirect to page with warningmsg rather than PrintXML

Modified Paths:
--------------
    trunk/lib/loadsave.php

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2011-11-04 09:23:48 UTC (rev 8173)
+++ trunk/lib/loadsave.php	2011-11-04 09:27:08 UTC (rev 8174)
@@ -1073,35 +1073,29 @@
     $mesg = HTML::div();
     $pagename = $request->getArg('pagename');
     $version = $request->getArg('version');
-    if (!$version) {
-        PrintXML(HTML::p(fmt("Revert")," ",WikiLink($pagename)),
-                 HTML::p(_("missing required version argument")));
-        return;
-    }
     $dbi =& $request->_dbi;
     $page = $dbi->getPage($pagename);
+    if (!$version) {
+        $request->redirect(WikiURL($page,
+                           array('warningmsg' => _('Revert: missing required version argument'))));
+        // noreturn
+    }
     $current = $page->getCurrentRevision();
     $currversion = $current->getVersion();
     if ($currversion == 0) {
-        $mesg->pushContent(' ', _("no page content"));
-        PrintXML(HTML::p(fmt("Revert")," ",WikiLink($pagename)),
-                 $mesg);
-        flush();
-        return;
+        $request->redirect(WikiURL($page,
+                           array('errormsg' => _('No revert: no page content'))));
+        // noreturn
     }
     if ($currversion == $version) {
-        $mesg->pushContent(' ', _("same version page"));
-        PrintXML(HTML::p(fmt("Revert")," ",WikiLink($pagename)),
-                 $mesg);
-        flush();
-        return;
+        $request->redirect(WikiURL($page,
+                           array('warningmsg' => _('No revert: same version page'))));
+        // noreturn
     }
     if ($request->getArg('cancel')) {
-        $mesg->pushContent(' ', _("Cancelled"));
-        PrintXML(HTML::p(fmt("Revert")," ",WikiLink($pagename)),
-                 $mesg);
-        flush();
-        return;
+        $request->redirect(WikiURL($page,
+                           array('warningmsg' => _('Revert cancelled'))));
+        // noreturn
     }
     if (!$request->getArg('verify')) {
         $mesg->pushContent(HTML::p(fmt("Are you sure to revert %s to version $version?", WikiLink($pagename))),

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