From 6187d9a89f84a554877bbe55ce3568460574cb53 Mon Sep 17 00:00:00 2001
From: shish <shish@7f39781d-f577-437e-ae19-be835c7a54ca>
Date: Mon, 16 Jul 2007 21:46:41 +0000
Subject: [PATCH] fix for new layout engine

git-svn-id: file:///home/shish/svn/shimmie2/trunk@306 7f39781d-f577-437e-ae19-be835c7a54ca
---
 ext/handle_404/main.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/ext/handle_404/main.php b/ext/handle_404/main.php
index dd843e00..eeecc264 100644
--- a/ext/handle_404/main.php
+++ b/ext/handle_404/main.php
@@ -3,9 +3,9 @@
 class Handle404 extends Extension {
 	public function receive_event($event) {
 		if(is_a($event, 'PageRequestEvent')) {
-			global $page;
+			$page = $event->page_object;
 			// hax.
-			if($page->mode == "page" && (!isset($page->blocks) || count($page->blocks) == 0)) {
+			if($page->mode == "page" && (!isset($page->blocks) || $this->count_main($page->blocks) == 0)) {
 				$h_pagename = html_escape($event->page);
 				header("HTTP/1.0 404 Page Not Found");
 				$page->set_title("404");
@@ -15,6 +15,14 @@ class Handle404 extends Extension {
 			}
 		}
 	}
+
+	private function count_main($blocks) {
+		$n = 0;
+		foreach($blocks as $block) {
+			if($block->section == "main") $n++; // more hax.
+		}
+		return $n;
+	}
 }
-add_event_listener(new Handle404(), 99);
+add_event_listener(new Handle404(), 99); // hax++
 ?>