From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 18 Mar 2005 05:38:49 +0000 (+0000)
Subject: Fix stupid error on template loading for nonexisting templates
X-Git-Tag: 1.5.0alpha1~592
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=d2a45840984530ce5a92ddf0a09c43b5d43c32d4;p=lhc%2Fweb%2Fwiklou.git

Fix stupid error on template loading for nonexisting templates
---

diff --git a/includes/Article.php b/includes/Article.php
index 7dd7584b71..1d1c2bae01 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -327,16 +327,26 @@ class Article {
 		if( $oldid ) {
 			$revision = Revision::newFromId( $oldid );
 			if( is_null( $revision ) ) {
+				wfDebug( "$fname failed to retrieve specified revision, id $oldid\n" );
 				return false;
 			}
 			$data = $this->pageDataFromId( $dbr, $revision->getPage() );
 			if( !$data ) {
+				wfDebug( "$fname failed to get page data linked to revision id $oldid\n" );
 				return false;
 			}
 			$this->mTitle = Title::makeTitle( $data->page_namespace, $data->page_title );
 		} else {
 			$data = $this->pageDataFromTitle( $dbr, $this->mTitle );
+			if( !$data ) {
+				wfDebug( "$fname failed to find page data for title " . $this->mTitle->getPrefixedText() . "\n" );
+				return false;
+			}
 			$revision = Revision::newFromId( $data->page_latest );
+			if( is_null( $revision ) ) {
+				wfDebug( "$fname failed to retrieve current page, rev_id $data->page_latest\n" );
+				return false;
+			}
 		}
 
 		# If we got a redirect, follow it (unless we've been told