search page asset bugfix

themexpert · Oct 12, 2015 · 644a060 · 644a060
1 parent 7048f81
commit 644a060
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/Application.php b/app/Application.php
@@ -49,6 +49,8 @@ protected function enqueue_assets() {
   }
 
   public function compile_assets() {
+    if(is_search()) return;
+
     if ( $this->shouldCompileScripts() ) {
       $page_id = $this->getCurrentPageId();
       $this->onepager->asset()->compileScriptsAndEnqueue( $page_id );

diff --git a/src/Providers/WordPress/Content.php b/src/Providers/WordPress/Content.php
@@ -79,7 +79,7 @@ public function isOnepage( $pageId = null ) {
       $pageId = $this->getCurrentPageId();
     }
 
-    if(array_key_exists('s', $_GET)) return false;
+    if(is_search()) return false;
 
     $isOnepage = $this->isOnepagerByTemplate( $pageId ) || $this->isOnepagerByMeta();
 

diff --git a/src/WordPress/PageTemplater.php b/src/WordPress/PageTemplater.php
@@ -69,7 +69,7 @@ public function view_project_template( $template ) {
     global $post;
 
     //if its a 404 page then return default template
-    if ( is_404() ) {
+    if ( is_404() || is_search() ) {
       return $template;
     }