Changeset 1477780

Timestamp:

08/18/2016 12:01:30 PM (10 years ago)

Author:

smartware.cc

Message:

current dev version for testing

File:

• 404page/trunk/404page.php (modified) (2 diffs)

404page/trunk/404page.php

@@ -140 +140 @@
     $pageid = $this->settings['404page_page_id'];
     if ( 0 != $pageid ) {
-      if ( empty( $posts ) && is_main_query() && !is_robots() && !is_home() && !is_feed() && !is_search() &&( !defined('DOING_AJAX') || !DOING_AJAX ) ) {
+      if ( empty( $posts ) && is_main_query() && !is_robots() && !is_home() && !is_feed() && !is_search() && !is_archive() && ( !defined('DOING_AJAX') || !DOING_AJAX ) ) {
         // we need to get the 404 page
         
@@ -206 +206 @@
   // this function overrides the page template in compatibilty mode
   function change_404_template( $template ) {
-    return $this->template;
+    // we have to check if the template file is there because if the theme was changed maybe a wrong template is stored in the database
+    if ( file_exists( $this->template ) || '' != locate_template( $this->template ) ) {
+      return $this->template;
+    } 
+    return $template;
   }