From 163d80e0f751dbf81336c932774ce38444d4643c Mon Sep 17 00:00:00 2001
From: Alexander Agnarson <alexander.agnarson@gmail.com>
Date: Tue, 25 May 2021 14:26:02 +0200
Subject: [PATCH] 3.1.2

---
 functions.php           |  4 +++-
 languages/magaziner.pot | 42 ++++++++++++++++++++---------------------
 readme.txt              |  4 ++++
 style.css               |  2 +-
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/functions.php b/functions.php
index 366d249..9caa647 100644
--- a/functions.php
+++ b/functions.php
@@ -96,8 +96,10 @@ add_action( 'after_setup_theme', 'magaziner_setup' );
 
 /*  Custom navigation
 /* ------------------------------------ */
-add_action( 'wp', function() {
+if ( ! class_exists( '\Magaziner\Nav' ) ) {
 	require_once 'functions/nav.php';
+}
+add_action( 'wp', function() {
 	$nav = new \Magaziner\Nav();
 	$nav->enqueue(
 		[
diff --git a/languages/magaziner.pot b/languages/magaziner.pot
index 896d85d..ce4d88d 100644
--- a/languages/magaziner.pot
+++ b/languages/magaziner.pot
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Magaziner\n"
-"POT-Creation-Date: 2021-03-05 15:47+0100\n"
+"POT-Creation-Date: 2021-05-25 14:25+0200\n"
 "PO-Revision-Date: 2018-09-21 21:27+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -78,83 +78,83 @@ msgstr ""
 msgid "Footer"
 msgstr ""
 
-#: functions.php:182
+#: functions.php:184
 msgid "Primary"
 msgstr ""
 
-#: functions.php:182 functions.php:183
+#: functions.php:184 functions.php:185
 msgid "Normal full width sidebar"
 msgstr ""
 
-#: functions.php:183
+#: functions.php:185
 msgid "Secondary"
 msgstr ""
 
-#: functions.php:185 functions/theme-options.php:308
+#: functions.php:187 functions/theme-options.php:308
 msgid "Header Ads"
 msgstr ""
 
-#: functions.php:186 functions/theme-options.php:335
+#: functions.php:188 functions/theme-options.php:335
 msgid "Footer Ads"
 msgstr ""
 
-#: functions.php:186
+#: functions.php:188
 msgid "Footer ads area"
 msgstr ""
 
-#: functions.php:188
+#: functions.php:190
 msgid "Frontpage Top 1"
 msgstr ""
 
-#: functions.php:188 functions.php:189 functions.php:190 functions.php:191
+#: functions.php:190 functions.php:191 functions.php:192 functions.php:193
 msgid "Frontpage area"
 msgstr ""
 
-#: functions.php:189
+#: functions.php:191
 msgid "Frontpage Top 2"
 msgstr ""
 
-#: functions.php:190
+#: functions.php:192
 msgid "Frontpage Bottom 1"
 msgstr ""
 
-#: functions.php:191
+#: functions.php:193
 msgid "Frontpage Bottom 2"
 msgstr ""
 
-#: functions.php:193
+#: functions.php:195
 msgid "Footer 1"
 msgstr ""
 
-#: functions.php:193 functions.php:194 functions.php:195 functions.php:196
+#: functions.php:195 functions.php:196 functions.php:197 functions.php:198
 msgid "Widgetized footer"
 msgstr ""
 
-#: functions.php:194
+#: functions.php:196
 msgid "Footer 2"
 msgstr ""
 
-#: functions.php:195
+#: functions.php:197
 msgid "Footer 3"
 msgstr ""
 
-#: functions.php:196
+#: functions.php:198
 msgid "Footer 4"
 msgstr ""
 
-#: functions.php:695
+#: functions.php:697
 msgid "Alx Extensions"
 msgstr ""
 
-#: functions.php:699
+#: functions.php:701
 msgid "Meta Box"
 msgstr ""
 
-#: functions.php:703
+#: functions.php:705
 msgid "Regenerate Thumbnails"
 msgstr ""
 
-#: functions.php:707
+#: functions.php:709
 msgid "WP-PageNavi"
 msgstr ""
 
diff --git a/readme.txt b/readme.txt
index 808c86b..234380c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -74,6 +74,10 @@ Source: https://stocksnap.io
 
 == Changelog ==
 
+= 3.1.2 - 2021-05-25 =
+* Fixed compatibility issue with custom nav and various security plugins
+* Updated language files
+
 = 3.1.1 - 2021-03-05 =
 * Fixed: mobile menu tabbing will enter in the menu even when it's closed
 * Fixed: trap focus in search popup
diff --git a/style.css b/style.css
index cfdeff3..5570ffe 100644
--- a/style.css
+++ b/style.css
@@ -1,7 +1,7 @@
 /*
 Theme Name: Magaziner
 Theme URI: http://alx.media/themes/magaziner/
-Version: 3.1.1
+Version: 3.1.2
 Requires at least: 5.0
 Requires PHP: 5.6
 Tested up to: 5.6