From 094011a5f57d155433068f794b610594b1129089 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sun, 12 May 2019 14:04:45 -0700
Subject: [PATCH] Cleanup
---
inc/class-eth-simple-shortlinks.php | 54 +++++++++++++++--------------
1 file changed, 28 insertions(+), 26 deletions(-)
diff --git a/inc/class-eth-simple-shortlinks.php b/inc/class-eth-simple-shortlinks.php
index 8549853..3b75ba1 100644
--- a/inc/class-eth-simple-shortlinks.php
+++ b/inc/class-eth-simple-shortlinks.php
@@ -271,32 +271,34 @@ class ETH_Simple_Shortlinks {
* @param WP $request WP object.
*/
public function action_parse_request( $request ) {
- if ( isset( $request->query_vars[ $this->qv ] ) ) {
- $dest = get_permalink( $request->query_vars['p'] );
-
- if ( $dest ) {
- /**
- * Filters the redirect URL.
- *
- * @param string $dest Redirect destination.
- * @param WP $request WP object.
- */
- $dest = apply_filters( 'eth_simple_shortlinks_redirect_url', $dest, $request );
-
- /**
- * Filters the redirect status code.
- *
- * @param int $status_code Redirect status code.
- * @param string $dest Redirect destination.
- * @param WP $request WP object.
- */
- $status_code = (int) apply_filters( 'eth_simple_shortlinks_redirect_status', 301, $dest, $request );
-
- // URLs aren't validated in case plugins filter permalinks to point to external URLs.
- // phpcs:ignore WordPress.Security.SafeRedirect.wp_redirect_wp_redirect
- wp_redirect( $dest, $status_code );
- exit;
- }
+ if ( ! isset( $request->query_vars[ $this->qv ], $request->query_vars['p'] ) ) {
+ return;
+ }
+
+ $dest = get_permalink( $request->query_vars['p'] );
+
+ /**
+ * Filters the redirect URL.
+ *
+ * @param string $dest Redirect destination.
+ * @param WP $request WP object.
+ */
+ $dest = apply_filters( 'eth_simple_shortlinks_redirect_url', $dest, $request );
+
+ if ( $dest ) {
+ /**
+ * Filters the redirect status code.
+ *
+ * @param int $status_code Redirect status code.
+ * @param string $dest Redirect destination.
+ * @param WP $request WP object.
+ */
+ $status_code = (int) apply_filters( 'eth_simple_shortlinks_redirect_status', 301, $dest, $request );
+
+ // URLs aren't validated in case plugins filter permalinks to point to external URLs.
+ // phpcs:ignore WordPress.Security.SafeRedirect.wp_redirect_wp_redirect
+ wp_redirect( $dest, $status_code );
+ exit;
}
}
--
GitLab