ref #521 -- fixed error in older versions of WP with get_the_ID()

jarednova · jarednova · commit da96f08e6d90 · 2015-04-11T23:36:43.000-04:00
diff --git a/lib/timber-post.php b/lib/timber-post.php
@@ -55,9 +55,17 @@ protected function determine_id($pid) {
     	} else if ($wp_query->is_home && isset($wp_query->queried_object_id) && $wp_query->queried_object_id )  {
     		//hack for static page as home page
     		$pid = $wp_query->queried_object_id;
-        } else if ($pid === null && get_the_ID()) {
-            $pid = get_the_ID();
-        } else if ($pid === null && ($pid_from_loop = TimberPostGetter::loop_to_id())) {
+        } else if ($pid === null) {
+        	$gtid = false;
+    		$maybe_post = get_post();
+    		if (isset($maybe_post->ID)){
+    			$gtid = true;
+    		}
+    		if ( $gtid ) {
+        	    $pid = get_the_ID();
+    		}
+        }
+        if ($pid === null && ($pid_from_loop = TimberPostGetter::loop_to_id())) {
             $pid = $pid_from_loop;
         }
         return $pid;
