From 606d526627491d5bcb036e4770d7bdebce3115de Mon Sep 17 00:00:00 2001
From: Carlos Barberis <carlos@silverstripe.com>
Date: Thu, 27 May 2010 21:38:24 +0000
Subject: [PATCH] BUGFIX: Deleted old js from BlogHolder ENHANCEMENT: do not
 show blog management widget when not logged in (ticket #5561 thanks ericdrex)

---
 code/BlogHolder.php                   | 13 +++----------
 code/widgets/BlogManagementWidget.php | 15 +++++++++------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/code/BlogHolder.php b/code/BlogHolder.php
index 775ea45..4baa508 100644
--- a/code/BlogHolder.php
+++ b/code/BlogHolder.php
@@ -183,7 +183,6 @@ class BlogHolder_Controller extends BlogTree_Controller {
 	 */
 	function post(){
 		if(!Permission::check('BLOGMANAGEMENT')) return Security::permissionFailure();
-		
 		$page = $this->customise(array(
 			'Content' => false,
 			'Form' => $this->BlogEntryForm()
@@ -195,14 +194,9 @@ class BlogHolder_Controller extends BlogTree_Controller {
 	/**
 	 * A simple form for creating blog entries
 	 */
-	function BlogEntryForm() {
+	function BlogEntryForm() {	
 		if(!Permission::check('BLOGMANAGEMENT')) return Security::permissionFailure();
-
-		Requirements::javascript('jsparty/behaviour.js');
-		Requirements::javascript('jsparty/prototype.js');
-		Requirements::javascript('jsparty/scriptaculous/effects.js');
-		Requirements::javascript('cms/javascript/PageCommentInterface.js');
-		Requirements::javascript('blog/javascript/bbcodehelp.js');
+		
 
 		$id = 0;
 		if(Director::urlParam('ID')) {
@@ -221,7 +215,6 @@ class BlogHolder_Controller extends BlogTree_Controller {
 				new LiteralField("BBCodeTags","<div id=\"BBTagsHolder\">".$codeparser->useable_tagsHTML()."</div>")
 			);
 		}
-
 		if(class_exists('TagField')) {
 			$tagfield = new TagField('Tags', null, null, 'BlogEntry');
 			$tagfield->setSeparator(', ');
@@ -242,7 +235,7 @@ class BlogHolder_Controller extends BlogTree_Controller {
 			new LiteralField("Tagsnote"," <label id='tagsnote'>"._t('BlogHolder.TE', "For example: sport, personal, science fiction")."<br/>" .
 												_t('BlogHolder.SPUC', "Please separate tags using commas.")."</label>")
 		);
-
+		
 		$submitAction = new FormAction('postblog', _t('BlogHolder.POST', 'Post blog entry'));
 		$actions = new FieldSet($submitAction);
 		$validator = new RequiredFields('Title','Content');
diff --git a/code/widgets/BlogManagementWidget.php b/code/widgets/BlogManagementWidget.php
index 2547eb9..eb9f4ec 100644
--- a/code/widgets/BlogManagementWidget.php
+++ b/code/widgets/BlogManagementWidget.php
@@ -48,16 +48,19 @@ class BlogManagementWidget extends Widget implements PermissionProvider {
 		return array("BLOGMANAGEMENT" => "Blog management");
 	}
 
-	function WidgetHolder() {
-		if(Permission::check("BLOGMANAGEMENT")) {
-			return $this->renderWith("WidgetHolder");
-		}
-	}
+}
 
+class BlogManagementWidget_Controller extends Widget_Controller { 
+	
+	function WidgetHolder() { 
+		if(Permission::check("BLOGMANAGEMENT")) { 
+			return $this->renderWith("WidgetHolder"); 
+		} 
+	}
+	
 	function PostLink() {
 		$container = BlogTree::current();
 		if ($container) return $container->Link('post');
 	}
-
 }
 ?>