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

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

Revision: 10896
          http://sourceforge.net/p/phpwiki/code/10896
Author:   vargenau
Date:     2022-01-13 16:58:32 +0000 (Thu, 13 Jan 2022)
Log Message:
-----------
function redirect does not return

Modified Paths:
--------------
    trunk/lib/plugin/AppendText.php
    trunk/lib/plugin/CreatePage.php
    trunk/lib/plugin/RedirectTo.php
    trunk/lib/plugin/UserPreferences.php
    trunk/lib/plugin/WikiTranslation.php

Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php	2022-01-13 16:08:30 UTC (rev 10895)
+++ trunk/lib/plugin/AppendText.php	2022-01-13 16:58:32 UTC (rev 10896)
@@ -52,7 +52,7 @@
         );
     }
 
-    private function fallback($addtext, $oldtext, $notfound, &$message)
+    private function fallback($addtext, $oldtext, $notfound, $message)
     {
         $message->pushContent(sprintf(_("“%s” not found"), $notfound) . ". " .
             _("Appending at the end.") . "\n");
@@ -64,11 +64,10 @@
      * @param string $argstr
      * @param WikiRequest $request
      * @param string $basepage
-     * @return mixed
+     * @return HTML|XmlContent
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
-
         $args = $this->getArgs($argstr, $request);
 
         $redirect = $args['redirect'];
@@ -95,12 +94,13 @@
         }
     }
 
-    private function work($pagename, $args, $dbi, &$request)
+    private function work($pagename, $args, $dbi, $request)
     {
         if (empty($args['s'])) {
             if ($request->isPost()) {
                 if ($pagename != _("AppendText"))
-                    return HTML($request->redirect(WikiURL($pagename, array(), 'absurl'), false));
+                    $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
+                    return HTML();
             }
             return HTML();
         }
@@ -151,16 +151,17 @@
 
         // AppendText has been called from the same page that got modified
         // so we directly show the page.
+        $redirect = $args['redirect'];
         if ($request->getArg($pagename) == $pagename) {
             // TODO: Just invalidate the cache, if AppendText didn't
             // change anything before.
             //
-            return $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
-
+            $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
+            return HTML();
             // The user asked to be redirected to the modified page
         } elseif ($redirect) {
-            return $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
-
+            $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
+            return HTML();
         } else {
             $link = HTML::em(WikiLink($pagename));
             $message->pushContent(HTML::raw(sprintf(_("Go to %s."), $link->asXML())));

Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php	2022-01-13 16:08:30 UTC (rev 10895)
+++ trunk/lib/plugin/CreatePage.php	2022-01-13 16:58:32 UTC (rev 10896)
@@ -60,7 +60,7 @@
      * @param string $argstr
      * @param WikiRequest $request
      * @param string $basepage
-     * @return mixed
+     * @return HTML|XmlContent
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
@@ -137,6 +137,7 @@
                 $page->save($content, $version + 1, $meta);
             }
         }
-        return HTML($request->redirect($url));
+        $request->redirect($url);
+        return HTML();
     }
 }

Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php	2022-01-13 16:08:30 UTC (rev 10895)
+++ trunk/lib/plugin/RedirectTo.php	2022-01-13 16:58:32 UTC (rev 10896)
@@ -57,7 +57,7 @@
      * @param string $argstr
      * @param WikiRequest $request
      * @param string $basepage
-     * @return mixed
+     * @return HTML|XmlContent
      */
     function run($dbi, $argstr, &$request, $basepage)
     {
@@ -111,6 +111,7 @@
             }
         }
 
-        return $request->redirect($url);
+        $request->redirect($url);
+        return HTML();
     }
 }

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2022-01-13 16:08:30 UTC (rev 10895)
+++ trunk/lib/plugin/UserPreferences.php	2022-01-13 16:58:32 UTC (rev 10896)
@@ -93,7 +93,8 @@
                     $request->setArg("delete", false);
                     if ($old_theme != THEME) {
                         $url = WikiURL(__("UserPreferences"), array(), 'absurl')."?num=reset";
-                        return HTML($request->redirect($url, false));
+                        $request->redirect($url, false);
+                        return HTML();
                     }
 
                     $errmsg .= _("Your UserPreferences have been successfully reset to default.");
@@ -162,7 +163,8 @@
                         // (mix of old and new templates)
                         if ($new_theme && ($new_theme != $old_theme)) {
                             $url = WikiURL(__("UserPreferences"), array(), 'absurl').'?num='.$num;
-                            return HTML($request->redirect($url, false));
+                            $request->redirect($url, false);
+                            return HTML();
                         }
                     }
 

Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php	2022-01-13 16:08:30 UTC (rev 10895)
+++ trunk/lib/plugin/WikiTranslation.php	2022-01-13 16:58:32 UTC (rev 10896)
@@ -402,7 +402,8 @@
                 }
                 // redirect or transclude?
                 if ($url) {
-                    return $request->redirect($url);
+                    $request->redirect($url);
+                    return HTML();
                 }
                 return HTML(fmt("TODO: Google can only translate from english and french. Find a translation service for %s to language %s",
                     WikiURL($pagename, array(), true),

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