fix some page redirection anomalies

(cherry picked from commit 4ee3abc)
exponentcms · Nov 12, 2016 · 8e4e34d · 8e4e34d
1 parent 82b86ea
commit 8e4e34d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/framework/core/subsystems/expRouter.php b/framework/core/subsystems/expRouter.php
@@ -480,12 +480,13 @@ public function routePageRequest() {
                                 $db->insertObject($redirectObject, 'redirect'); // missing redirected page
                                 return false;
                             } else {
+                                //log redirect took place
                                 $redirectObject->redirected = true;
                                 $redirectObject->new_sef_name = $page_redirect->new_sef_name;
                                 $db->insertObject($redirectObject, 'redirect');
                                 $_REQUEST['section'] = $section->id;
-                                //log redirect took place
-                                header("Location: " . $this->makeLink(array('section' => intval($_REQUEST['section']))), TRUE, $page_redirect->type);
+                                $type = !empty($page_redirect->type) ? $page_redirect->type : 200;
+                                header("Location: " . $this->makeLink(array('section' => intval($_REQUEST['section']))), TRUE, $type);
                             }
                         }
                     } else {

diff --git a/framework/modules/navigation/controllers/navigationController.php b/framework/modules/navigation/controllers/navigationController.php
@@ -825,6 +825,7 @@ public function edit_redirection() {
         }
         assign_to_template(array(
             'record'     => $record,
+            'sef_name'   => $sef_name,
         ));
     }
 

diff --git a/framework/modules/navigation/views/navigation/edit_redirection.tpl b/framework/modules/navigation/views/navigation/edit_redirection.tpl
@@ -19,7 +19,7 @@
     </h1>
     {form action=update_redirection}
         {control type="hidden" name="id" value=$record->id}
-        {control type="text" name="old_sef_name" label="Redirect From"|gettext value=$record->old_sef_name}
+        {control type="text" name="old_sef_name" label="Redirect From"|gettext value=$record->old_sef_name|default:$sef_name}
         {control type="text" name="new_sef_name" label="Redirect To"|gettext value=$record->new_sef_name}
         {control type="dropdown" name="type" label="HTTP Status Code"|gettext items="Moved Permanently (301),Moved Temporarly (307),Custom URL"|gettxtlist values="'301,307,url" value=$record->type|default:301}
         {control type="buttongroup" submit="Submit"|gettext cancel="Cancel"|gettext}