From 37690fac6bfa1356e305ed0ed181feb5cf8d5b3d Mon Sep 17 00:00:00 2001
From: Vishal Deshpande <deshpande.2004@gmail.com>
Date: Mon, 27 Nov 2017 08:57:36 +0530
Subject: [PATCH 01/10] Create right-sidebar-check.php

---
 global-templates/right-sidebar-check.php | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 global-templates/right-sidebar-check.php

diff --git a/global-templates/right-sidebar-check.php b/global-templates/right-sidebar-check.php
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/global-templates/right-sidebar-check.php
@@ -0,0 +1 @@
+

From bd4c012053042c00fb300ee2d22289ad29b0f951 Mon Sep 17 00:00:00 2001
From: Vishal Deshpande <deshpande.2004@gmail.com>
Date: Mon, 27 Nov 2017 09:01:27 +0530
Subject: [PATCH 02/10] Update right-sidebar-check.php

---
 global-templates/right-sidebar-check.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/global-templates/right-sidebar-check.php b/global-templates/right-sidebar-check.php
index 8b137891..0552019a 100644
--- a/global-templates/right-sidebar-check.php
+++ b/global-templates/right-sidebar-check.php
@@ -1 +1,15 @@
+<?php
+/**
+ * Right sidebar check.
+ *
+ * @package understrap
+ */
 
+
+$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
+
+if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : 
+
+  get_sidebar( 'right' ); 
+
+endif;

From a647e54bd266bccef29b4bee78b871235564ab4e Mon Sep 17 00:00:00 2001
From: Vishal Deshpande <deshpande.2004@gmail.com>
Date: Mon, 27 Nov 2017 09:03:41 +0530
Subject: [PATCH 03/10] Update right-sidebar-check.php

---
 global-templates/right-sidebar-check.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/global-templates/right-sidebar-check.php b/global-templates/right-sidebar-check.php
index 0552019a..5152c54e 100644
--- a/global-templates/right-sidebar-check.php
+++ b/global-templates/right-sidebar-check.php
@@ -4,12 +4,12 @@
  *
  * @package understrap
  */
+?>
 
+<?php $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' ); ?>
 
-$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
+<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
 
-if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : 
+  <?php get_sidebar( 'right' ); ?>
 
-  get_sidebar( 'right' ); 
-
-endif;
+<?php endif; ?>

From 0aa882f07172386e38d8f88822f5ca2ad606e54c Mon Sep 17 00:00:00 2001
From: Vishal Deshpande <deshpande.2004@gmail.com>
Date: Mon, 27 Nov 2017 09:04:22 +0530
Subject: [PATCH 04/10] Update index.php

---
 index.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/index.php b/index.php
index 0ea055a0..6b405356 100644
--- a/index.php
+++ b/index.php
@@ -14,7 +14,6 @@
 get_header();
 
 $container   = get_theme_mod( 'understrap_container_type' );
-$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 ?>
 
 <?php if ( is_front_page() && is_home() ) : ?>
@@ -64,11 +63,8 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 		</div><!-- #primary -->
 
 		<!-- Do the right sidebar check -->
-		<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-
-			<?php get_sidebar( 'right' ); ?>
-
-		<?php endif; ?>
+		<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
+		
 
 	</div><!-- .row -->
 

From 1d62f68b8109971b6002aa00214a0d91861c031b Mon Sep 17 00:00:00 2001
From: Vishal Deshpande <deshpande.2004@gmail.com>
Date: Mon, 27 Nov 2017 09:05:28 +0530
Subject: [PATCH 05/10] Update archive.php

---
 archive.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/archive.php b/archive.php
index 73aa964c..167dcbee 100644
--- a/archive.php
+++ b/archive.php
@@ -12,7 +12,6 @@ get_header();
 
 <?php
 $container   = get_theme_mod( 'understrap_container_type' );
-$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 ?>
 
 <div class="wrapper" id="archive-wrapper">
@@ -64,11 +63,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 		</div><!-- #primary -->
 
 		<!-- Do the right sidebar check -->
-		<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-
-			<?php get_sidebar( 'right' ); ?>
-
-		<?php endif; ?>
+		<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
 
 	</div> <!-- .row -->
 

From 5c8b51affec2d63f0db23261e870f233ee165f8c Mon Sep 17 00:00:00 2001
From: Vishal Deshpande <deshpande.2004@gmail.com>
Date: Mon, 27 Nov 2017 09:06:12 +0530
Subject: [PATCH 06/10] Update author.php

---
 author.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/author.php b/author.php
index 15c72538..98d88b70 100644
--- a/author.php
+++ b/author.php
@@ -9,7 +9,6 @@
 
 get_header();
 $container   = get_theme_mod( 'understrap_container_type' );
-$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 ?>
 
 
@@ -88,11 +87,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 		</div><!-- #primary -->
 
 		<!-- Do the right sidebar check -->
-		<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-
-			<?php get_sidebar( 'right' ); ?>
-
-		<?php endif; ?>
+		<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
 
 	</div> <!-- .row -->
 

From 8e052de950a785e983335947f4cd57a9e212849d Mon Sep 17 00:00:00 2001
From: Vishal Deshpande <deshpande.2004@gmail.com>
Date: Mon, 27 Nov 2017 09:07:41 +0530
Subject: [PATCH 07/10] Update page.php

---
 page.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/page.php b/page.php
index 773e55a6..c1aa362e 100644
--- a/page.php
+++ b/page.php
@@ -13,7 +13,6 @@
 get_header();
 
 $container   = get_theme_mod( 'understrap_container_type' );
-$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 
 ?>
 
@@ -46,11 +45,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 		</div><!-- #primary -->
 
 		<!-- Do the right sidebar check -->
-		<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-
-			<?php get_sidebar( 'right' ); ?>
-
-		<?php endif; ?>
+		<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
 
 	</div><!-- .row -->
 

From 11efa88b7b3c87fd5cf0a66f0d131f212bba1c24 Mon Sep 17 00:00:00 2001
From: Vishal Deshpande <deshpande.2004@gmail.com>
Date: Mon, 27 Nov 2017 09:40:48 +0530
Subject: [PATCH 08/10] Update search.php

---
 search.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/search.php b/search.php
index ee25d153..a6599106 100644
--- a/search.php
+++ b/search.php
@@ -8,7 +8,7 @@
 get_header();
 
 $container   = get_theme_mod( 'understrap_container_type' );
-$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
+
 ?>
 
 <div class="wrapper" id="search-wrapper">
@@ -61,11 +61,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 		</div><!-- #primary -->
 
 		<!-- Do the right sidebar check -->
-		<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-
-			<?php get_sidebar( 'right' ); ?>
-
-		<?php endif; ?>
+		<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
 
 	</div><!-- .row -->
 

From 7e9264e86379b745bee11b79e4229ef29501766f Mon Sep 17 00:00:00 2001
From: Vishal Deshpande <deshpande.2004@gmail.com>
Date: Mon, 27 Nov 2017 09:41:45 +0530
Subject: [PATCH 09/10] Update single.php

---
 single.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/single.php b/single.php
index 2e8483ea..6c5a46fa 100644
--- a/single.php
+++ b/single.php
@@ -7,7 +7,6 @@
 
 get_header();
 $container   = get_theme_mod( 'understrap_container_type' );
-$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 ?>
 
 <div class="wrapper" id="single-wrapper">
@@ -41,11 +40,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 		</div><!-- #primary -->
 
 		<!-- Do the right sidebar check -->
-		<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-
-			<?php get_sidebar( 'right' ); ?>
-
-		<?php endif; ?>
+		<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
 
 	</div><!-- .row -->
 

From 0ee0ec7d570caace7fdce233771d984e36d1a946 Mon Sep 17 00:00:00 2001
From: Vishal Deshpande <deshpande.2004@gmail.com>
Date: Mon, 27 Nov 2017 09:42:15 +0530
Subject: [PATCH 10/10] Update woocommerce.php

---
 woocommerce.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/woocommerce.php b/woocommerce.php
index c49290fe..26d22732 100644
--- a/woocommerce.php
+++ b/woocommerce.php
@@ -13,7 +13,7 @@
 get_header();
 
 $container   = get_theme_mod( 'understrap_container_type' );
-$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
+
 
 ?>
 
@@ -55,11 +55,7 @@ $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
 		</div><!-- #primary -->
 
 		<!-- Do the right sidebar check -->
-		<?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ) : ?>
-
-			<?php get_sidebar( 'right' ); ?>
-
-		<?php endif; ?>
+		<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
 
 	</div><!-- .row -->