From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 15 Jan 2016 15:20:40 +0000 (-0500)
Subject: fix conflict
X-Git-Tag: v1.0.0^2~40
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5f627ea38efd14ed9588d3af3f419879175b67a1;p=WP-Themes%2Fotsego.git

fix conflict
---

5f627ea38efd14ed9588d3af3f419879175b67a1
diff --cc index.php
index ee2bd37,4e15961..8699a02
--- a/index.php
+++ b/index.php
@@@ -12,16 -12,30 +12,31 @@@
                  </div>
              </div>
              <div class="row">
-                 <?php if(!(is_page(2670))) { ?>
+                 <?php
+                 $isEmploymentAppPage = false;
+                 if (shortcode_exists('glmjobs')) {
+                     $isEmploymentAppPage = true;
+                     $applyOnline = (isset($_REQUEST['applyOnline']))
+                         ? filter_var($_REQUEST['applyOnline'], FILTER_VALIDATE_INT)
+                         : false;
+                     $job = (isset($_REQUEST['job']))
+                         ? filter_var($_REQUEST['job'], FILTER_VALIDATE_INT)
+                         : false;
+                     $search = (isset($_REQUEST['glm_job_search']))
+                         ? filter_var($_REQUEST['glm_job_search'], FILTER_VALIDATE_BOOLEAN)
+                         : false;
+                 }
+                 ?>
+                 <?php if( !(is_page(2670)) && !$isEmploymentAppPage ) { ?>
                  <div id="main-content" class="small-12 large-8 columns right">
-                         <?php if(have_posts()) : while(have_posts()): the_post();?>
-                         <?php the_content();?>
-                         <?php endwhile; else:?>
-                         <p><?php _e('Sorry, no results found.');?></p>
-                         <?php endif;?>
+                             <?php if(have_posts()) : while(have_posts()): the_post();?>
+                             <?php the_content();?>
+                             <?php endwhile; else:?>
+                             <p><?php _e('Sorry, no results found.');?></p>
+                             <?php endif;?>
                  </div>
-               
 -                <div class="side-links Large-4 show-for-large-up columns">
++
 +                <div class="side-links Large-4 show-for-large-up columns left">
                      <?php get_sidebar(); ?>
                  </div>
                  <?php } else { ?>