From 0e5bd5ef3f2c97787f5d4b93ebac020970b08ff2 Mon Sep 17 00:00:00 2001
From: Shea Bunge <info@bungeshea.com>
Date: Mon, 23 Feb 2015 22:03:47 +1030
Subject: [PATCH] Fix not redirecting to edit page after adding a snippet

---
 includes/edit/edit.php      | 27 ++++++++++++---------------
 languages/code-snippets.pot |  6 +++---
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/includes/edit/edit.php b/includes/edit/edit.php
index 18e5610b..0ee40c04 100644
--- a/includes/edit/edit.php
+++ b/includes/edit/edit.php
@@ -116,40 +116,37 @@ function code_snippets_load_single_menu() {
 		}
 
 		/* Save the snippet to the database */
-		$network = get_current_screen()->is_network;
-		$result = save_snippet( stripslashes_deep( $_POST ), $network  );
-
-		/* Strip old status query vars from URL */
-		$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'added', 'updated', 'activated', 'deactivated', 'invalid' ) );
-
-		/* Change the redirect URL to the edit snippet page if a new snippet was successfully added */
-		if ( $result && $result > 1 && ! isset( $_POST['snippet_id'] ) ) {
-			$_SERVER['REQUEST_URI'] = code_snippets_get_menu_url( 'edit' );
-		}
+		$result = save_snippet( stripslashes_deep( $_POST )  );
 
 		/* Build the status message and redirect */
+		$query_args = array();
 
 		if ( $result && isset( $_POST['save_snippet_activate'] ) ) {
 			/* Snippet was activated addition to saving*/
-			$_SERVER['REQUEST_URI'] = add_query_arg( 'activated', true );
+			$query_args['activated'] = true;
 		}
 		elseif ( $result && isset( $_POST['save_snippet_deactivate'] ) ) {
 			/* Snippet was deactivated addition to saving*/
-			$_SERVER['REQUEST_URI'] = add_query_arg( 'deactivated', true );
+			$query_args['deactivated'] = true;
 		}
 
 		if ( ! $result || $result < 1 ) {
 			/* An error occurred */
-			wp_redirect( add_query_arg( 'invalid', true ) );
+			$query_args['invalid'] = true;
 		}
 		elseif ( isset( $_POST['snippet_id'] ) ) {
 			/* Existing snippet was updated */
-			wp_redirect( add_query_arg(	array( 'id' => $result, 'updated' => true ) ) );
+			$query_args['id'] = $result;
+			$query_args['updated'] = true;
 		}
 		else {
 			/* New snippet was added */
-			wp_redirect( add_query_arg(	array( 'id' => $result, 'added' => true ) ) );
+			$query_args['id'] = $result;
+			$query_args['added'] = true;
 		}
+
+		/* Redirect to edit snippet page */
+		wp_redirect( add_query_arg( $query_args, code_snippets_get_menu_url( 'edit' ) ) );
 	}
 
 	/* Delete the snippet if the button was clicked */
diff --git a/languages/code-snippets.pot b/languages/code-snippets.pot
index 84c1b06c..cffa9610 100644
--- a/languages/code-snippets.pot
+++ b/languages/code-snippets.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: code-snippets 2.0.0-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-23 17:50+1030\n"
+"POT-Creation-Date: 2015-02-23 22:26+1030\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -272,11 +272,11 @@ msgstr ""
 msgid "You are not access this page."
 msgstr ""
 
-#: includes/edit/edit.php:179 includes/manage/class-list-table.php:242
+#: includes/edit/edit.php:176 includes/manage/class-list-table.php:242
 msgid "Description"
 msgstr ""
 
-#: includes/edit/edit.php:208 includes/manage/class-list-table.php:243
+#: includes/edit/edit.php:205 includes/manage/class-list-table.php:243
 msgid "Tags"
 msgstr ""