diff --git a/module/repo/model.php b/module/repo/model.php
index 9a29e30f01..208c9ff696 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -1510,7 +1510,7 @@ class repoModel extends model
         preg_match_all("/{$rules['designReg']}/i", $comment, $matches);
         if($matches[0])
         {
-            $designs = join(' ', $matches[1]);
+            $designs = implode(' ', $matches[1]);
             if($designs) $designs = array_unique(explode(' ', str_replace(',', ' ', $designs)));
         }
 
diff --git a/module/repo/zen.php b/module/repo/zen.php
index 3ebf969a65..9bf47ee82a 100644
--- a/module/repo/zen.php
+++ b/module/repo/zen.php
@@ -1309,14 +1309,12 @@ class repoZen extends repo
         $oldRevision = isset($this->post->revision[1]) ? $this->post->revision[1] : '';
         $newRevision = isset($this->post->revision[0]) ? $this->post->revision[0] : '';
 
-        if($this->post->arrange)
-        {
-            $arrange = $this->post->arrange;
-            helper::setcookie('arrange', $arrange);
-        }
         if($this->post->encoding)      $encoding      = $this->post->encoding;
         if($this->post->isBranchOrTag) $isBranchOrTag = (int)$this->post->isBranchOrTag;
 
+        if($this->post->arrange) $arrange = $this->post->arrange;
+        helper::setcookie('arrange', $arrange);
+
         return $this->locate($this->repo->createLink('diff', "repoID={$repoID}&objectID={$objectID}&entry={$file}&oldrevision={$oldRevision}&newRevision={$newRevision}&showBug=0&encoding={$encoding}&isBranchOrTag={$isBranchOrTag}"));
     }