From 5e567cbf80976f04019416a534096c7ed816b0df Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Thu, 12 Apr 2012 11:21:21 +1200 Subject: [PATCH 1/2] BUGFIX Declare StaticPublisher::set_static_publisher_theme() and StaticPublisher::static_publisher_theme() as static, since they're only called statically. This is a fix for E_STRICT compliance. --- code/staticpublisher/StaticPublisher.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/code/staticpublisher/StaticPublisher.php b/code/staticpublisher/StaticPublisher.php index 64315340..46b49f0d 100644 --- a/code/staticpublisher/StaticPublisher.php +++ b/code/staticpublisher/StaticPublisher.php @@ -26,7 +26,15 @@ abstract class StaticPublisher extends DataExtension { abstract function publishPages($pages); abstract function unpublishPages($pages); + + static function set_static_publisher_theme($theme){ + self::$static_publisher_theme=$theme; + } + static function static_publisher_theme(){ + return self::$static_publisher_theme; + } + static function echo_progress() { return (boolean)self::$echo_progress; } @@ -144,13 +152,6 @@ abstract class StaticPublisher extends DataExtension { return $urls; } - - function set_static_publisher_theme($theme){ - self::$static_publisher_theme=$theme; - } - - function static_publisher_theme(){ - return self::$static_publisher_theme; - } + } From 8325d73665b6c47edae3f3b9756314d8e368adff Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Thu, 12 Apr 2012 11:23:15 +1200 Subject: [PATCH 2/2] MINOR Fixing method signatures not compliant with the parent --- code/controllers/ReportAdmin.php | 4 ++-- code/widgets/WidgetAreaEditor.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/controllers/ReportAdmin.php b/code/controllers/ReportAdmin.php index 1594eb5e..2d462f7a 100644 --- a/code/controllers/ReportAdmin.php +++ b/code/controllers/ReportAdmin.php @@ -108,8 +108,8 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider { * Returns the Breadcrumbs for the ReportAdmin * @return ArrayList */ - public function Breadcrumbs() { - $items = parent::Breadcrumbs(); + public function Breadcrumbs($unlinked = false) { + $items = parent::Breadcrumbs($unlinked); // The root element should explicitly point to the root node. // Uses session state for current record otherwise. diff --git a/code/widgets/WidgetAreaEditor.php b/code/widgets/WidgetAreaEditor.php index 8c99508c..9c5dcd11 100644 --- a/code/widgets/WidgetAreaEditor.php +++ b/code/widgets/WidgetAreaEditor.php @@ -61,7 +61,7 @@ class WidgetAreaEditor extends FormField { return $this->form->getRecord()->getComponent($relationName)->ID; } - function saveInto(DataObject $record) { + function saveInto(DataObjectInterface $record) { $name = $this->name; $idName = $name . "ID"; @@ -139,4 +139,4 @@ class WidgetAreaEditor extends FormField { } } } -} \ No newline at end of file +}