Description: Fix upstream issue #126 - Edit link does not contain offset
Origin: upstream, https://gitlab.com/jeroenrnl/zoph/-/tree/issue%23126
Last-Update: 2020-06-09 
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/php/classes/photo/view/confirm.inc.php
+++ b/php/classes/photo/view/confirm.inc.php
@@ -57,8 +57,8 @@
     public function view() {
         $actionlinks=array(
             "confirm"   =>  "photo.php?_action=confirm&amp;photo_id=" . $this->photo->getId() .
-                            "&amp;_qs=" . $this->request->getEncodedQueryString(),
-            "cancel"    =>  "photo.php?" . $this->request["_qs"]
+                            "&amp;_qs=" . $this->request->getPassedQueryString()->encode(),
+            "cancel"    =>  "photo.php?" . $this->request->getPassedQueryString()
         );
         return new template("confirm", array(
             "title"     =>  translate("delete photo"),
--- a/php/classes/web/queryString.inc.php
+++ b/php/classes/web/queryString.inc.php
@@ -90,7 +90,7 @@
      */
     public function getReturn() {
         $return=$this->getPassed();
-        if (empty($return)) {
+        if (empty((string)$return)) {
             $return = $this->regexClean(array(
                 "/_crumb=\d+&?/",
                 "/_action=\w+&?/"
--- a/php/classes/web/request.inc.php
+++ b/php/classes/web/request.inc.php
@@ -189,7 +189,7 @@
      * query string through this function.
      */
     public function getPassedQueryString() {
-        return $this->queryString->getPassed()->get();
+        return $this->queryString->getPassed();
     }
 
     /**
