tonyair/silverstripe-blog
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-blog synced 2024-10-22 11:05:58 +02:00
Code Issues Projects Releases Wiki Activity

merge changes from upstream/SS3-fixes

Browse Source
This commit is contained in:
morven 2012-07-02 12:16:32 +01:00
commit 31bd2e74d3
11 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/BlogEntry.php
View File

@ -87,7 +87,6 @@ class BlogEntry extends Page {
* Returns the tags added to this blog entry
*/
function TagsCollection() {
$tags = preg_split(" *, *", trim($this->Tags));
$output = new ArrayList();

3
code/BlogHolder.php
View File

@ -46,7 +46,6 @@ class BlogHolder extends BlogTree implements PermissionProvider {
/**
* Get members who have BLOGMANAGEMENT and ADMIN permission
*/
function blogOwners($sort = array('FirstName'=>'ASC','Surname'=>'ASC'), $direction = null) {
$members = Permission::get_members_by_permission(array('ADMIN','BLOGMANAGEMENT'));
@ -239,7 +238,6 @@ class BlogHolder_Controller extends BlogTree_Controller {
);
$submitAction = new FormAction('postblog', _t('BlogHolder.POST', 'Post blog entry'));
$actions = new FieldList($submitAction);
$validator = new RequiredFields('Title','BlogPost');
@ -250,7 +248,6 @@ class BlogHolder_Controller extends BlogTree_Controller {
if($entry->IsOwner()) {
$form->loadDataFrom($entry);
$form->Fields()->fieldByName('BlogPost')->setValue($entry->Content);
}
} else {
$form->loadDataFrom(array("Author" => Cookie::get("BlogHolder_Name")));

11
code/BlogTree.php
View File

@ -95,7 +95,6 @@ class BlogTree extends Page {
function getCMSFields() {
$fields = parent::getCMSFields();
$fields->addFieldToTab("Root.Main", new TextField("Name", "Name of blog"));
$fields->addFieldToTab('Root.Main', new DropdownField('LandingPageFreshness', 'When you first open the blog, how many entries should I show', array(
"" => "All entries",
@ -113,11 +112,9 @@ class BlogTree extends Page {
"12 MONTH" => "Last year's entries",
"INHERIT" => "Take value from parent Blog Tree"
)));
if(class_exists('WidgetArea')) {
$fields->addFieldToTab("Root.Widgets", new CheckboxField("InheritSideBar", 'Inherit Sidebar From Parent'));
$fields->addFieldToTab("Root.Widgets", new WidgetAreaEditor("SideBar"));
}
$fields->addFieldToTab("Root.Widgets", new CheckboxField("InheritSideBar", 'Inherit Sidebar From Parent'));
$fields->addFieldToTab("Root.Widgets", new WidgetAreaEditor("SideBar"));
return $fields;
}
@ -347,4 +344,4 @@ class BlogTree_Controller extends Page_Controller {
return date("Y", mktime(0, 0, 0, date('m'), 1, $date));
}
}
}
}

2
code/TrackBackDecorator.php
View File

@ -2,7 +2,6 @@
/**
* Add trackback (receive and send) feature blog entry
*/
class TrackBackDecorator extends DataExtension {
static $trackback_server_class = 'TrackbackHTTPServer';
@ -42,7 +41,6 @@ class TrackBackDecorator extends DataExtension {
// $fields->addFieldToTab("Root.Content.Main", new ReadonlyField("TrackBackURLsReadOnly", _t("BlogEntry.TrackbackURLs", "Trackback URLs"), _t("BlogEntry.TrackbackURLs_DISABLED", "To use this feature, please check 'Enable TrackBacks' check box on the blog holder.")));
// }
// }
function onBeforePublish() {
if(!$this->owner->TrackBacksEnabled() && !$this->owner->TrackBackURLs()) return;

3
code/TrackBackURL.php
View File

@ -11,7 +11,6 @@ class TrackBackURL extends DataObject {
);
function getCMSFields_forPopup() {
return new FieldList(
new TextField('URL'),
new ReadonlyField('Pung', 'Pung?')
@ -52,4 +51,4 @@ class TrackBackURL extends DataObject {
return false;
}
}
}

1
code/widgets/ArchiveWidget.php
View File

@ -32,7 +32,6 @@ class ArchiveWidget extends Widget {
$fields = parent::getCMSFields();
$fields->merge(
new FieldList(
new OptionsetField(
'DisplayMode',

6
code/widgets/BlogManagementWidget.php
View File

@ -21,7 +21,6 @@ class BlogManagementWidget extends Widget implements PermissionProvider {
static $description = "Provide a number of links useful for administering a blog. Only shown if the user is an admin.";
function CommentText() {
if(!class_exists('Comment')) return false;
$unmoderatedcount = DB::query("SELECT COUNT(*) FROM \"PageComment\" WHERE \"NeedsModeration\"=1")->value();
if($unmoderatedcount == 1) {
@ -34,8 +33,9 @@ class BlogManagementWidget extends Widget implements PermissionProvider {
}
function CommentLink() {
if(!Permission::check('BLOGMANAGEMENT') || !class_exists('Comment')) return false;
if(!Permission::check('BLOGMANAGEMENT') || !class_exists('Comment')) {
return false;
}
$unmoderatedcount = DB::query("SELECT COUNT(*) FROM \"PageComment\" WHERE \"NeedsModeration\"=1")->value();
if($unmoderatedcount > 0) {

1
code/widgets/TagCloudWidget.php
View File

@ -30,7 +30,6 @@ class TagCloudWidget extends Widget {
$fields = parent::getCMSFields();
$fields->merge(
new FieldList(
new TextField("Title", _t("TagCloudWidget.TILE", "Title")),
new TextField("Limit", _t("TagCloudWidget.LIMIT", "Limit number of tags")),

1
javascript/bbcodehelp.js
View File

@ -9,4 +9,3 @@ $.entwine('ss', function($){
});
}(jQuery));

1
tests/BlogHolderFunctionalTest.php
View File

@ -47,6 +47,5 @@ class BlogHolderFunctionalTest extends FunctionalTest {
$response = $this->post('blog/BlogEntryForm', $data);
$this->assertInstanceOf('BlogEntry', DataObject::get_one('BlogEntry', sprintf("\"Title\" = 'Allowed'")));
}
}

3
thirdparty/xmlrpc/xmlrpc.php vendored
View File

@ -1527,7 +1527,6 @@
curl_setopt($curl, CURLOPT_VERBOSE, 1);
}
curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent);
// required for XMLRPC: post the data
curl_setopt($curl, CURLOPT_POST, 1);
// the data
@ -3774,4 +3773,4 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
}
}
?>
?>