Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MINOR: resolve conflicts after merging

  • Loading branch information...
commit 5a21b4eeb9a80d6bdc4173f8fa281a43dd03ce88 2 parents 36c31be + 90a0e80
carlos barberis cbarberis authored
2  code/BlogEntry.php
View
@@ -87,11 +87,11 @@ function getCMSFields() {
* Returns the tags added to this blog entry
*/
function TagsCollection() {
+
$tags = preg_split(" *, *", trim($this->Tags));
$output = new ArrayList();
$link = $this->getParent() ? $this->getParent()->Link('tag') : '';
-
foreach($tags as $tag) {
$output->push(new ArrayData(array(
'Tag' => $tag,
3  code/BlogHolder.php
View
@@ -46,6 +46,7 @@ function getCMSFields() {
/**
* 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'));
@@ -232,6 +233,7 @@ function BlogEntryForm() {
);
$submitAction = new FormAction('postblog', _t('BlogHolder.POST', 'Post blog entry'));
+
$actions = new FieldList($submitAction);
$validator = new RequiredFields('Title','BlogPost');
@@ -242,6 +244,7 @@ function BlogEntryForm() {
if($entry->IsOwner()) {
$form->loadDataFrom($entry);
$form->Fields()->fieldByName('BlogPost')->setValue($entry->Content);
+
}
} else {
$form->loadDataFrom(array("Author" => Cookie::get("BlogHolder_Name")));
1  code/BlogTree.php
View
@@ -95,6 +95,7 @@ function SideBar() {
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",
2  code/TrackBackDecorator.php
View
@@ -2,6 +2,7 @@
/**
* Add trackback (receive and send) feature blog entry
*/
+
class TrackBackDecorator extends DataExtension {
static $trackback_server_class = 'TrackbackHTTPServer';
@@ -41,6 +42,7 @@ 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;
1  code/TrackBackURL.php
View
@@ -11,6 +11,7 @@ class TrackBackURL extends DataObject {
);
function getCMSFields_forPopup() {
+
return new FieldList(
new TextField('URL'),
new ReadonlyField('Pung', 'Pung?')
1  code/widgets/ArchiveWidget.php
View
@@ -32,6 +32,7 @@ function getCMSFields() {
$fields = parent::getCMSFields();
$fields->merge(
+
new FieldList(
new OptionsetField(
'DisplayMode',
6 code/widgets/BlogManagementWidget.php
View
@@ -21,6 +21,7 @@ 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) {
@@ -33,9 +34,8 @@ function CommentText() {
}
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
@@ -30,6 +30,7 @@ function getCMSFields() {
$fields = parent::getCMSFields();
$fields->merge(
+
new FieldList(
new TextField("Title", _t("TagCloudWidget.TILE", "Title")),
new TextField("Limit", _t("TagCloudWidget.LIMIT", "Limit number of tags")),
3  javascript/bbcodehelp.js
View
@@ -8,4 +8,5 @@ $.entwine('ss', function($){
});
});
-}(jQuery));
+}(jQuery));
+
1  tests/BlogHolderFunctionalTest.php
View
@@ -47,5 +47,6 @@ function testFrontendBlogPostRequiresPermission() {
$response = $this->post('blog/BlogEntryForm', $data);
$this->assertInstanceOf('BlogEntry', DataObject::get_one('BlogEntry', sprintf("\"Title\" = 'Allowed'")));
+
}
}
1  thirdparty/xmlrpc/xmlrpc.php
View
@@ -1527,6 +1527,7 @@ function &sendPayloadCURL($msg, $server, $port, $timeout=0, $username='',
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
Please sign in to comment.
Something went wrong with that request. Please try again.