From 90a0e80667ceb37dde25a7c2c811b07e46ee33fd Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Sat, 14 Apr 2012 11:08:18 +1200 Subject: [PATCH] Revert "BUGFIX Initial fixes to support at least building the blog module on SS3" This reverts commit 8b58156211b0ede5e0dd72e577df4d2870b95373. --- code/BlogEntry.php | 11 ++++++----- code/BlogHolder.php | 30 ++++++++++++++++-------------- code/BlogTree.php | 6 +++--- code/TrackBackDecorator.php | 6 +++--- code/widgets/ArchiveWidget.php | 4 ++-- code/widgets/RSSWidget.php | 4 ++-- code/widgets/TagCloudWidget.php | 6 +++--- tests/BlogTrackbackTest.php | 4 ++-- 8 files changed, 37 insertions(+), 34 deletions(-) diff --git a/code/BlogEntry.php b/code/BlogEntry.php index f882b50..862b07c 100644 --- a/code/BlogEntry.php +++ b/code/BlogEntry.php @@ -49,7 +49,7 @@ class BlogEntry extends Page { $this->setField('Date', date('Y-m-d H:i:s', strtotime('now'))); } - function getCMSFields($params = null) { + function getCMSFields() { Requirements::javascript('blog/javascript/bbcodehelp.js'); Requirements::themedCSS('bbcodehelp'); @@ -57,7 +57,7 @@ class BlogEntry extends Page { $codeparser = new BBCodeParser(); SiteTree::disableCMSFieldsExtensions(); - $fields = parent::getCMSFields($params); + $fields = parent::getCMSFields(); SiteTree::enableCMSFieldsExtensions(); if(!self::$allow_wysiwyg_editing) { @@ -87,8 +87,8 @@ class BlogEntry extends Page { * Returns the tags added to this blog entry */ function TagsCollection() { - $tags = preg_split('/ *, */', trim($this->Tags)); - $output = new ArrayList(); + $tags = split(" *, *", trim($this->Tags)); + $output = new DataObjectSet(); $link = $this->getParent() ? $this->getParent()->Link('tag') : ''; @@ -270,6 +270,7 @@ class BlogEntry_Controller extends Page_Controller { */ function PageComments() { if($this->hasMethod('CommentsForm')) return $this->CommentsForm(); + else return parent::PageComments(); } - + } diff --git a/code/BlogHolder.php b/code/BlogHolder.php index d0053a3..b50d830 100644 --- a/code/BlogHolder.php +++ b/code/BlogHolder.php @@ -27,15 +27,15 @@ class BlogHolder extends BlogTree implements PermissionProvider { 'BlogEntry' ); - function getCMSFields($params = null) { + function getCMSFields() { $blogOwners = $this->blogOwners(); SiteTree::disableCMSFieldsExtensions(); - $fields = parent::getCMSFields($params); + $fields = parent::getCMSFields(); SiteTree::enableCMSFieldsExtensions(); $fields->addFieldToTab('Root.Content.Main', new CheckboxField('TrackBacksEnabled', 'Enable TrackBacks')); - $fields->addFieldToTab('Root.Content.Main', new DropdownField('OwnerID', 'Blog owner', $blogOwners->map('ID', 'Name'))); + $fields->addFieldToTab('Root.Content.Main', new DropdownField('OwnerID', 'Blog owner', $blogOwners->toDropDownMap('ID', 'Name', 'None'))); $fields->addFieldToTab('Root.Content.Main', new CheckboxField('AllowCustomAuthors', 'Allow non-admins to have a custom author field')); $this->extend('updateCMSFields', $fields); @@ -49,15 +49,15 @@ class BlogHolder extends BlogTree implements PermissionProvider { function blogOwners($sort = 'Name', $direction = "ASC") { $adminMembers = Permission::get_members_by_permission('ADMIN'); $blogOwners = Permission::get_members_by_permission('BLOGMANAGEMENT'); - - if(!$adminMembers) $adminMembers = new ArrayList(); - if(!$blogOwners) $blogOwners = new ArrayList(); - + + if(!$adminMembers) $adminMembers = new DataObjectSet(); + if(!$blogOwners) $blogOwners = new DataObjectSet(); + $blogOwners->merge($adminMembers); $blogOwners->sort($sort, $direction); - + $this->extend('extendBlogOwners', $blogOwners); - + return $blogOwners; } @@ -204,7 +204,7 @@ class BlogHolder_Controller extends BlogTree_Controller { } $codeparser = new BBCodeParser(); - $membername = Member::currentUser() ? Member::currentUser()->getName() : ""; + $membername = Member::currentMember() ? Member::currentMember()->getName() : ""; if(BlogEntry::$allow_wysiwyg_editing) { $contentfield = new HtmlEditorField("BlogPost", _t("BlogEntry.CN")); @@ -226,7 +226,7 @@ class BlogHolder_Controller extends BlogTree_Controller { if(!$this->AllowCustomAuthors && !Permission::check('ADMIN')) { $field = 'ReadonlyField'; } - $fields = new FieldList( + $fields = new FieldSet( new HiddenField("ID", "ID"), new TextField("Title", _t('BlogHolder.SJ', "Subject")), new $field("Author", _t('BlogEntry.AU'), $membername), @@ -237,7 +237,7 @@ class BlogHolder_Controller extends BlogTree_Controller { ); $submitAction = new FormAction('postblog', _t('BlogHolder.POST', 'Post blog entry')); - $actions = new FieldList($submitAction); + $actions = new FieldSet($submitAction); $validator = new RequiredFields('Title','BlogPost'); $form = new Form($this, 'BlogEntryForm',$fields, $actions,$validator); @@ -246,7 +246,7 @@ class BlogHolder_Controller extends BlogTree_Controller { $entry = DataObject::get_by_id('BlogEntry', $id); if($entry->IsOwner()) { $form->loadDataFrom($entry); - $form->Fields()->dataFieldByName('BlogPost')->setValue($entry->Content); + $form->datafieldByName('BlogPost')->setValue($entry->Content); } } else { $form->loadDataFrom(array("Author" => Cookie::get("BlogHolder_Name"))); @@ -274,7 +274,7 @@ class BlogHolder_Controller extends BlogTree_Controller { $form->saveInto($blogentry); $blogentry->ParentID = $this->ID; - $blogentry->Content = str_replace("\r\n", "\n", $form->Fields()->dataFieldByName('BlogPost')->dataValue()); + $blogentry->Content = str_replace("\r\n", "\n", $form->datafieldByName('BlogPost')->dataValue()); if(Object::has_extension($this->ClassName, 'Translatable')) { $blogentry->Locale = $this->Locale; @@ -288,3 +288,5 @@ class BlogHolder_Controller extends BlogTree_Controller { } } + +?> diff --git a/code/BlogTree.php b/code/BlogTree.php index 9ba3dff..758d828 100644 --- a/code/BlogTree.php +++ b/code/BlogTree.php @@ -93,8 +93,8 @@ class BlogTree extends Page { /* ----------- CMS CONTROL -------------- */ - function getCMSFields($params = null) { - $fields = parent::getCMSFields($params); + function getCMSFields() { + $fields = parent::getCMSFields(); $fields->addFieldToTab("Root.Content.Main", new TextField("Name", "Name of blog")); $fields->addFieldToTab('Root.Content.Main', new DropdownField('LandingPageFreshness', 'When you first open the blog, how many entries should I show', array( "" => "All entries", @@ -344,4 +344,4 @@ class BlogTree_Controller extends Page_Controller { return date("Y", mktime(0, 0, 0, date('m'), 1, $date)); } } -} +} \ No newline at end of file diff --git a/code/TrackBackDecorator.php b/code/TrackBackDecorator.php index 57a71a5..5356fd9 100644 --- a/code/TrackBackDecorator.php +++ b/code/TrackBackDecorator.php @@ -2,11 +2,11 @@ /** * Add trackback (receive and send) feature blog entry */ -class TrackBackDecorator extends DataExtension { +class TrackBackDecorator extends DataObjectDecorator { static $trackback_server_class = 'TrackbackHTTPServer'; - function extraStatics($class = null, $extension = null) { + function extraStatics() { return array( 'has_many' => array( 'TrackBackURLs' => 'TrackBackURL', @@ -15,7 +15,7 @@ class TrackBackDecorator extends DataExtension { ); } - function updateCMSFields(FieldList $fields) { + function updateCMSFields($fields) { // Trackback URL field if($this->owner->TrackBacksEnabled()) { $trackbackURLTable = new ComplexTableField( diff --git a/code/widgets/ArchiveWidget.php b/code/widgets/ArchiveWidget.php index 9dfb3f5..77b2c7b 100644 --- a/code/widgets/ArchiveWidget.php +++ b/code/widgets/ArchiveWidget.php @@ -28,8 +28,8 @@ class ArchiveWidget extends Widget { static $description = 'Show a list of months or years in which there are blog posts, and provide links to them.'; - function getCMSFields($params = null) { - $fields = parent::getCMSFields($params); + function getCMSFields() { + $fields = parent::getCMSFields(); $fields->merge( new FieldSet( diff --git a/code/widgets/RSSWidget.php b/code/widgets/RSSWidget.php index 4640bbf..17f8bc9 100644 --- a/code/widgets/RSSWidget.php +++ b/code/widgets/RSSWidget.php @@ -39,8 +39,8 @@ class RSSWidget extends Widget { } } - function getCMSFields($params = null) { - $fields = parent::getCMSFields($params); + function getCMSFields() { + $fields = parent::getCMSFields(); $fields->merge( new FieldSet( diff --git a/code/widgets/TagCloudWidget.php b/code/widgets/TagCloudWidget.php index 7d47a1c..ed1bbe0 100644 --- a/code/widgets/TagCloudWidget.php +++ b/code/widgets/TagCloudWidget.php @@ -26,9 +26,9 @@ class TagCloudWidget extends Widget { static $popularities = array( 'not-popular', 'not-very-popular', 'somewhat-popular', 'popular', 'very-popular', 'ultra-popular' ); - function getCMSFields($params = null) { - $fields = parent::getCMSFields($params); - + function getCMSFields() { + $fields = parent::getCMSFields(); + $fields->merge( new FieldSet( new TextField("Title", _t("TagCloudWidget.TILE", "Title")), diff --git a/tests/BlogTrackbackTest.php b/tests/BlogTrackbackTest.php index 4a3e53c..cf9550e 100644 --- a/tests/BlogTrackbackTest.php +++ b/tests/BlogTrackbackTest.php @@ -60,7 +60,7 @@ class BlogTrackbackTest extends SapphireTest { $entry1 = $this->objFromFixture('BlogEntry', 'testpost'); $entry1->doPublish(); $this->assertEquals(2, $entry1->TrackBackURLs()->Count()); - $this->assertEquals(array('testGoodTrackbackURL' => 1), $entry1->TrackBackURLs()->map('URL', 'Pung')->toArray()); + $this->assertEquals(array('testGoodTrackbackURL' => 1), $entry1->TrackBackURLs()->map('URL', 'Pung')); $entry2 = $this->objFromFixture('BlogEntry', 'testpost2'); $entry2->doPublish(); @@ -123,4 +123,4 @@ class TestTrackbackHTTPServer extends TrackbackHTTPServer implements TestOnly { Some error text "; } -} +} \ No newline at end of file