From f0f5dcb966da9123e88dc1f8acc71065cfd7c8d8 Mon Sep 17 00:00:00 2001
From: Tim Klein <tim@dodat.co.nz>
Date: Fri, 9 Nov 2012 16:44:48 +1300
Subject: [PATCH] fixed mediaform urls in modeladmin

see http://open.silverstripe.org/ticket/8013
---
 forms/HtmlEditorField.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php
index 436c975d1..e577e4cef 100644
--- a/forms/HtmlEditorField.php
+++ b/forms/HtmlEditorField.php
@@ -278,8 +278,8 @@ class HtmlEditorField_Toolbar extends RequestHandler {
 	public function forTemplate() {
 		return sprintf(
 			'<div id="cms-editor-dialogs" data-url-linkform="%s" data-url-mediaform="%s"></div>',
-			Controller::join_links($this->controller->Link($this->name), 'LinkForm', 'forTemplate'),
-			Controller::join_links($this->controller->Link($this->name), 'MediaForm', 'forTemplate')
+			Controller::join_links($this->controller->Link(), $this->name, 'LinkForm', 'forTemplate'),
+			Controller::join_links($this->controller->Link(), $this->name, 'MediaForm', 'forTemplate')
 		);
 	}