From 6f24680aac7f0548abff6b04af1a15d2468399a2 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Fri, 14 Apr 2017 16:04:11 -0400
Subject: [PATCH] Cleaning up some issues with rewrites.

---
 setup/frontHooks.php               | 16 ++++++++++------
 views/admin/management/header.html |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/setup/frontHooks.php b/setup/frontHooks.php
index 4ed2b282..64f598d9 100644
--- a/setup/frontHooks.php
+++ b/setup/frontHooks.php
@@ -27,9 +27,10 @@
   */
 
 // Setup rewrite for member detail page - Now includes optional member_info ID (profile) parameter for multi-profile members
+define ('GLM_MEMBERS_REWRITE_RULE', '('.$this->config['settings']['canonical_member_page'].')/([^/]*)/?([^/]*)?');
 add_filter( 'rewrite_rules_array', function($rules) {
     $newrules = array();
-    $newrules['('.$this->config['settings']['canonical_member_page'].')/([^/]*)/?([^/]*)?']='index.php?pagename=$matches[1]&memberslug=$matches[2]&profile=$matches[3]';
+    $newrules[GLM_MEMBERS_REWRITE_RULE]='index.php?pagename=$matches[1]&memberslug=$matches[2]&profile=$matches[3]';
     return $newrules + $rules;
 });
 add_filter( 'query_vars', function($vars) {
@@ -38,11 +39,14 @@ add_filter( 'query_vars', function($vars) {
     return $vars;
 });
 add_action('wp_loaded', function() {
-    $rules = get_option('rewrite_rules');
-    if ( ! isset( $rules['('.$this->config['settings']['canonical_member_page'].')/([^/]*)/?([^/]*)?'] ) ) {
-        trigger_error('Doing rewrite flush - Member detail page', E_USER_NOTICE); // Logging that this is happening so we can track when that happens.
-        global $wp_rewrite;
-        $wp_rewrite->flush_rules();
+    // Only do this if this is a front-end request
+    if (!is_admin()) {
+        $rules = get_option('rewrite_rules');
+        if ( ! isset( $rules[GLM_MEMBERS_REWRITE_RULE] ) ) {
+            trigger_error('Doing rewrite flush - Member detail page', E_USER_NOTICE); // Logging that this is happening so we can track when that happens.
+            global $wp_rewrite;
+            $wp_rewrite->flush_rules();
+        }
     }
 });
 
diff --git a/views/admin/management/header.html b/views/admin/management/header.html
index 99b0aec0..eed6833a 100644
--- a/views/admin/management/header.html
+++ b/views/admin/management/header.html
@@ -5,7 +5,7 @@
     <h2 class="nav-tab-wrapper">
         <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">General Settings</a>
         <a href="{$thisUrl}?page={$thisPage}&glm_action=terms" class="nav-tab{if $thisAction==terms} nav-tab-active{/if}">Terms and Phrases</a>
-        <a href="{$thisUrl}?page={$thisPage}&glm_action=theme" class="nav-tab{if $thisAction==theme} nav-tab-active{/if}">Theme Settings</a>
+      <!-- <a href="{$thisUrl}?page={$thisPage}&glm_action=theme" class="nav-tab{if $thisAction==theme} nav-tab-active{/if}">Theme Settings</a>  -->
         <a href="{$thisUrl}?page={$thisPage}&glm_action=development" class="nav-tab{if $thisAction==development} nav-tab-active{/if}">Development</a>
         <a href="{$thisUrl}?page={$thisPage}&glm_action=import" class="nav-tab{if $thisAction==import} nav-tab-active{/if}">Members</a>
         <a href="{$thisUrl}?page={$thisPage}&glm_action=addons" class="nav-tab{if $thisAction==addons} nav-tab-active{/if}">Add-Ons</a>
-- 
2.17.1