From a41cf18c23bc564bbc4bb5d6ee37ed166e4431be Mon Sep 17 00:00:00 2001 From: Saophalkun Ponlu Date: Tue, 28 Jul 2009 05:33:22 +0000 Subject: [PATCH] BUGFIX: trackbackping generated an exception. getExtensionInstance returns an instance with NULL owner so TrackBackDecorator->owner->ID was always unavailable --- code/BlogEntry.php | 4 ++-- code/TrackBackDecorator.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/BlogEntry.php b/code/BlogEntry.php index c2fbf8e..dc70217 100644 --- a/code/BlogEntry.php +++ b/code/BlogEntry.php @@ -160,8 +160,8 @@ class BlogEntry extends Page { } function trackbackping() { - if($this->TrackBacksEnabled()) { - return $this->extInstance('TrackBackDecorator')->trackbackping(); + if($this->TrackBacksEnabled() && $this->hasExtension('TrackBackDecorator')) { + return $this->decoratedTrackbackping(); } else { Director::redirect($this->Link()); } diff --git a/code/TrackBackDecorator.php b/code/TrackBackDecorator.php index abe6bca..73c1a1d 100644 --- a/code/TrackBackDecorator.php +++ b/code/TrackBackDecorator.php @@ -17,7 +17,7 @@ class TrackBackDecorator extends DataObjectDecorator { return $this->owner->AbsoluteLink() . 'trackbackping'; } - function trackbackping() { + function decoratedTrackbackping() { $error = 0; $message = '';