'),dialog.attr("id",(new Date).getTime()),dialog.data("url",url),$("body").append(dialog)}}),$(".leftandmain-logindialog").entwine({onmatch:function(){this._super(),this.ssdialog({iframeUrl:this.data("url"),dialogClass:"leftandmain-logindialog-dialog",autoOpen:!0,minWidth:500,maxWidth:500,minHeight:370,maxHeight:400,closeOnEscape:!1,open:function(){$(".ui-widget-overlay").addClass("leftandmain-logindialog-overlay")},close:function(){$(".ui-widget-overlay").removeClass("leftandmain-logindialog-overlay")}})},onunmatch:function(){this._super()},open:function(){this.ssdialog("open")},close:function(){this.ssdialog("close")},toggle:function(bool){this.is(":visible")?this.close():this.open()},reauthenticate:function(data){"undefined"!=typeof data.SecurityID&&$(":input[name=SecurityID]").val(data.SecurityID),"undefined"!=typeof data.TempID&&$("body").data("member-tempid",data.TempID),this.close()}}),$("form.loading,.cms-content.loading,.cms-content-fields.loading,.cms-content-view.loading").entwine({onmatch:function(){this.append(''),this._super()},onunmatch:function(){this.find(".cms-content-loading-overlay,.cms-content-loading-spinner").remove(),this._super()}}),$('.cms input[type="submit"], .cms button, .cms input[type="reset"], .cms .ss-ui-button').entwine({onadd:function(){this.addClass("ss-ui-button"),this.data("button")||this.button(),this._super()},onremove:function(){this.data("button")&&this.button("destroy"),this._super()}}),$(".cms .cms-panel-link").entwine({onclick:function(e){if($(this).hasClass("external-link"))return void e.stopPropagation();var href=this.attr("href"),url=href&&!href.match(/^#/)?href:this.data("href"),data={pjax:this.data("pjaxTarget")};$(".cms-container").loadPanel(url,null,data),e.preventDefault()}}),$(".cms .ss-ui-button-ajax").entwine({onclick:function onclick(e){$(this).removeClass("ui-button-text-only"),$(this).addClass("ss-ui-button-loading ui-button-text-icons");var loading=$(this).find(".ss-ui-loading-icon");loading.length<1&&(loading=$("").addClass("ss-ui-loading-icon ui-button-icon-primary ui-icon"),$(this).prepend(loading)),loading.show();var href=this.attr("href"),url=href?href:this.data("href");jQuery.ajax({url:url,complete:function complete(xmlhttp,status){var msg=xmlhttp.getResponseHeader("X-Status")?xmlhttp.getResponseHeader("X-Status"):xmlhttp.responseText;try{"undefined"!=typeof msg&&null!==msg&&eval(msg)}catch(e){}loading.hide(),$(".cms-container").refresh(),$(this).removeClass("ss-ui-button-loading ui-button-text-icons"),$(this).addClass("ui-button-text-only")},dataType:"html"}),e.preventDefault()}}),$(".cms .ss-ui-dialog-link").entwine({UUID:null,onmatch:function(){this._super(),this.setUUID((new Date).getTime())},onunmatch:function(){this._super()},onclick:function(){this._super();var id="ss-ui-dialog-"+this.getUUID(),dialog=$("#"+id);dialog.length||(dialog=$(''),$("body").append(dialog));var extraClass=this.data("popupclass")?this.data("popupclass"):"";return dialog.ssdialog({iframeUrl:this.attr("href"),autoOpen:!0,dialogExtraClass:extraClass}),!1}}),$(".cms-content .btn-toolbar").entwine({onmatch:function(){this.find(".ss-ui-button").click(function(){var form=this.form;form&&(form.clickedButton=this,setTimeout(function(){form.clickedButton=null},10))}),this.redraw(),this._super()},onunmatch:function(){this._super()},redraw:function(){window.debug&&console.log("redraw",this.attr("class"),this.get(0)),this.contents().filter(function(){return 3==this.nodeType&&!/\S/.test(this.nodeValue)}).remove(),this.find(".ss-ui-button").each(function(){$(this).data("button")||$(this).button()}),this.find(".ss-ui-buttonset").buttonset()}}),$(".cms .field.date input.text").entwine({onmatch:function(){var holder=$(this).parents(".field.date:first"),config=holder.data();return config.showcalendar?(config.showOn="button",config.locale&&$.datepicker.regional[config.locale]&&(config=$.extend(config,$.datepicker.regional[config.locale],{})),$(this).datepicker(config),void this._super()):void this._super()},onunmatch:function(){this._super()}}),$(".cms .field.dropdown select, .cms .field select[multiple], .fieldholder-small select.dropdown").entwine({onmatch:function(){return this.is(".no-chosen")?void this._super():(this.data("placeholder")||this.data("placeholder"," "),this.removeClass("has-chosen").chosen("destroy"),this.siblings(".chosen-container").remove(),applyChosen(this),void this._super())},onunmatch:function(){this._super()}}),$(".cms-panel-layout").entwine({redraw:function(){window.debug&&console.log("redraw",this.attr("class"),this.get(0))}}),$(".cms .ss-gridfield").entwine({showDetailView:function(url){var params=window.location.search.replace(/^\?/,"");params&&(url=$.path.addSearchParams(url,params)),$(".cms-container").loadPanel(url)}}),$(".cms-search-form").entwine({onsubmit:function(e){var nonEmptyInputs,url;nonEmptyInputs=this.find(":input:not(:submit)").filter(function(){var vals=$.grep($(this).fieldValue(),function(val){return val});return vals.length}),url=this.attr("action"),nonEmptyInputs.length&&(url=$.path.addSearchParams(url,nonEmptyInputs.serialize().replace("+","%20")));var container=this.closest(".cms-container");return container.find(".cms-edit-form").tabs("select",0),container.loadPanel(url,"",{},!0),!1}}),$(".cms-search-form button[type=reset], .cms-search-form input[type=reset]").entwine({onclick:function(e){e.preventDefault();var form=$(this).parents("form");form.clearForm(),form.find(".dropdown select").prop("selectedIndex",0).trigger("chosen:updated"),form.submit()}}),window._panelDeferredCache={},$(".cms-panel-deferred").entwine({onadd:function(){this._super(),this.redraw()},onremove:function(){window.debug&&console.log("saving",this.data("url"),this),this.data("deferredNoCache")||(window._panelDeferredCache[this.data("url")]=this.html()),this._super()},redraw:function(){window.debug&&console.log("redraw",this.attr("class"),this.get(0));var self=this,url=this.data("url");if(!url)throw'Elements of class .cms-panel-deferred need a "data-url" attribute';this._super(),this.children().length||(this.data("deferredNoCache")||"undefined"==typeof window._panelDeferredCache[url]?(this.addClass("loading"),$.ajax({url:url,complete:function(){self.removeClass("loading")},success:function(data,status,xhr){self.html(data)}})):this.html(window._panelDeferredCache[url]))}}),$(".cms-tabset").entwine({onadd:function(){this.redrawTabs(),this._super()},onremove:function(){this.data("tabs")&&this.tabs("destroy"),this._super()},redrawTabs:function(){this.rewriteHashlinks();var activeTab=(this.attr("id"),this.find("ul:first .ui-tabs-active"));this.data("uiTabs")||this.tabs({active:-1!=activeTab.index()?activeTab.index():0,beforeLoad:function(e,ui){return!1},activate:function(e,ui){var actions=$(this).closest("form").find(".btn-toolbar");$(ui.newTab).closest("li").hasClass("readonly")?actions.fadeOut():actions.show()}}),this.trigger("afterredrawtabs")},rewriteHashlinks:function(){$(this).find("ul a").each(function(){if($(this).attr("href")){var matches=$(this).attr("href").match(/#.*/);matches&&$(this).attr("href",document.location.href.replace(/#.*/,"")+matches[0])}})}}),$("#filters-button").entwine({onmatch:function(){this._super(),this.data("collapsed",!0),this.data("animating",!1)},onunmatch:function(){this._super()},showHide:function(){var self=this,$filters=$(".cms-content-filters").first(),collapsed=this.data("collapsed");this.data("animating")||(this.toggleClass("active"),this.data("animating",!0),$filters[collapsed?"slideDown":"slideUp"]({complete:function(){self.data("collapsed",!collapsed),self.data("animating",!1)}}))},onclick:function(){this.showHide()}})});var statusMessage=function(text,type){text=jQuery("").text(text).html(),jQuery.noticeAdd({text:text,type:type,stayTime:5e3,inEffect:{left:"0",opacity:"show"}})},errorMessage=function(text){jQuery.noticeAdd({text:text,type:"error",stayTime:5e3,inEffect:{left:"0",opacity:"show"}})}},{jQuery:"jQuery"}]},{},[1]);
//# sourceMappingURL=bundle-legacy.js.map
diff --git a/admin/client/src/legacy/LeftAndMain.BatchActions.js b/admin/client/src/legacy/LeftAndMain.BatchActions.js
index f9e50a8bd..94bf57639 100644
--- a/admin/client/src/legacy/LeftAndMain.BatchActions.js
+++ b/admin/client/src/legacy/LeftAndMain.BatchActions.js
@@ -47,7 +47,7 @@ $.entwine('ss.tree', function($){
*/
registerDefault: function() {
// Publish selected pages action
- this.register('admin/pages/batchactions/publish', function(ids) {
+ this.register(ss.config.adminUrl + 'pages/batchactions/publish', function(ids) {
var confirmed = confirm(
i18n.inject(
i18n._t(
@@ -61,7 +61,7 @@ $.entwine('ss.tree', function($){
});
// Unpublish selected pages action
- this.register('admin/pages/batchactions/unpublish', function(ids) {
+ this.register(ss.config.adminUrl + 'pages/batchactions/unpublish', function(ids) {
var confirmed = confirm(
i18n.inject(
i18n._t(
@@ -76,7 +76,7 @@ $.entwine('ss.tree', function($){
// Delete selected pages action
// @deprecated since 4.0 Use archive instead
- this.register('admin/pages/batchactions/delete', function(ids) {
+ this.register(ss.config.adminUrl + 'pages/batchactions/delete', function(ids) {
var confirmed = confirm(
i18n.inject(
i18n._t(
@@ -90,7 +90,7 @@ $.entwine('ss.tree', function($){
});
// Delete selected pages action
- this.register('admin/pages/batchactions/archive', function(ids) {
+ this.register(ss.config.adminUrl + 'pages/batchactions/archive', function(ids) {
var confirmed = confirm(
i18n.inject(
i18n._t(
@@ -104,7 +104,7 @@ $.entwine('ss.tree', function($){
});
// Restore selected archived pages
- this.register('admin/pages/batchactions/restore', function(ids) {
+ this.register(ss.config.adminUrl + 'pages/batchactions/restore', function(ids) {
var confirmed = confirm(
i18n.inject(
i18n._t(
@@ -118,7 +118,7 @@ $.entwine('ss.tree', function($){
});
// Delete selected pages from live action
- this.register('admin/pages/batchactions/deletefromlive', function(ids) {
+ this.register(ss.config.adminUrl + 'pages/batchactions/deletefromlive', function(ids) {
var confirmed = confirm(
i18n.inject(
i18n._t(
diff --git a/admin/code/AdminRootController.php b/admin/code/AdminRootController.php
index efcfcb3f7..d138875e2 100644
--- a/admin/code/AdminRootController.php
+++ b/admin/code/AdminRootController.php
@@ -6,15 +6,35 @@ use SilverStripe\ORM\DataModel;
* @package framework
* @subpackage admin
*/
-class AdminRootController extends Controller {
+class AdminRootController extends Controller implements TemplateGlobalProvider {
/**
- * @var string
- * @config
- * The url base that all LeftAndMain derived panels will live under
- * Won't automatically update the base route if you change this - that has to be done seperately
+ * Convenience function to return the admin route config.
+ * Looks for the {@link Director::$rules} for the current admin Controller.
*/
- private static $url_base = 'admin';
+ public static function get_admin_route() {
+ if (Controller::has_curr()) {
+ $routeParams = Controller::curr()->getRequest()->routeParams();
+ $adminControllerClass = isset($routeParams['Controller']) ? $routeParams['Controller'] : get_called_class();
+ }
+ else {
+ $adminControllerClass = get_called_class();
+ }
+
+ $rules = Config::inst()->get('Director', 'rules');
+ $adminRoute = array_search($adminControllerClass, $rules);
+ return $adminRoute ? $adminRoute : '';
+ }
+
+ /**
+ * Returns the root admin URL for the site with trailing slash
+ *
+ * @return string
+ * @uses get_admin_route()
+ */
+ public static function admin_url() {
+ return self::get_admin_route() . '/';
+ }
/**
* @var string
@@ -70,10 +90,9 @@ class AdminRootController extends Controller {
public function handleRequest(SS_HTTPRequest $request, DataModel $model) {
// If this is the final portion of the request (i.e. the URL is just /admin), direct to the default panel
if ($request->allParsed()) {
- $base = $this->config()->url_base;
$segment = Config::inst()->get($this->config()->default_panel, 'url_segment');
- $this->redirect(Controller::join_links($base, $segment, '/'));
+ $this->redirect(Controller::join_links(self::admin_url(), $segment, '/'));
return $this->getResponse();
}
@@ -92,4 +111,14 @@ class AdminRootController extends Controller {
return $this->httpError(404, 'Not found');
}
+
+ /**
+ * @return array Returns an array of strings of the method names of methods on the call that should be exposed
+ * as global variables in the templates.
+ */
+ public static function get_template_global_variables() {
+ return array(
+ 'adminURL' => 'admin_url'
+ );
+ }
}
diff --git a/admin/code/CMSMenu.php b/admin/code/CMSMenu.php
index df377a95b..13ee96031 100644
--- a/admin/code/CMSMenu.php
+++ b/admin/code/CMSMenu.php
@@ -17,7 +17,8 @@ use SilverStripe\Security\Member;
* @package framework
* @subpackage admin
*/
-class CMSMenu extends Object implements IteratorAggregate, i18nEntityProvider {
+class
+CMSMenu extends Object implements IteratorAggregate, i18nEntityProvider {
/**
* Sort by menu priority, highest to lowest
@@ -71,7 +72,7 @@ class CMSMenu extends Object implements IteratorAggregate, i18nEntityProvider {
* @return CMSMenuItem
*/
protected static function menuitem_for_controller($controllerClass) {
- $urlBase = Config::inst()->get($controllerClass, 'url_base', Config::FIRST_SET);
+ $urlBase = AdminRootController::admin_url();
$urlSegment = Config::inst()->get($controllerClass, 'url_segment', Config::FIRST_SET);
$menuPriority = Config::inst()->get($controllerClass, 'menu_priority', Config::FIRST_SET);
diff --git a/admin/code/CampaignAdmin.php b/admin/code/CampaignAdmin.php
index d614684ef..7c1c0719c 100644
--- a/admin/code/CampaignAdmin.php
+++ b/admin/code/CampaignAdmin.php
@@ -85,6 +85,7 @@ class CampaignAdmin extends LeftAndMain implements PermissionProvider {
public function schema($request) {
// TODO Hardcoding schema until we can get GridField to generate a schema dynamically
$treeClassJS = Convert::raw2js($this->config()->tree_class);
+ $adminURL = Convert::raw2js(AdminRootController::admin_url());
$json = <<stat('url_base', true),
+ AdminRootController::admin_url(),
$segment,
'/', // trailing slash needed if $action is null!
"$action"
@@ -847,7 +838,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
// default menu is the one with a blank {@link url_segment}
} else if(singleton($menuItem->controller)->stat('url_segment') == '') {
- if($this->Link() == $this->stat('url_base').'/') {
+ if($this->Link() == AdminRootController::admin_url()) {
$linkingmode = "current";
}
diff --git a/admin/templates/Includes/LeftAndMain_MenuStatus.ss b/admin/templates/Includes/LeftAndMain_MenuStatus.ss
index a67bfaa18..3226623fc 100644
--- a/admin/templates/Includes/LeftAndMain_MenuStatus.ss
+++ b/admin/templates/Includes/LeftAndMain_MenuStatus.ss
@@ -3,7 +3,7 @@
<% with $CurrentMember %>
<%t LeftAndMain_Menu_ss.Hello 'Hi' %>
-
+
<% if $FirstName && $Surname %>$FirstName $Surname<% else_if $FirstName %>$FirstName<% else %>$Email<% end_if %>
diff --git a/control/Director.php b/control/Director.php
index 0b65ce593..eb9da32ce 100644
--- a/control/Director.php
+++ b/control/Director.php
@@ -407,7 +407,7 @@ class Director implements TemplateGlobalProvider {
if (isset($_REQUEST['debug'])) Debug::show($rules);
foreach($rules as $pattern => $controllerOptions) {
- if (is_string($controllerOptions)) {
+ if(is_string($controllerOptions)) {
if (substr($controllerOptions, 0, 2) == '->') {
$controllerOptions = array('Redirect' => substr($controllerOptions, 2));
} else {
diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/02_CMS_Architecture.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/02_CMS_Architecture.md
index eaeb2aba4..903e365ba 100644
--- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/02_CMS_Architecture.md
+++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/02_CMS_Architecture.md
@@ -60,6 +60,43 @@ Along with the new sprite containing your image, there will also be a new variab
the sprite (eg `@extend .icon-sprites-32x32;`), and then including your image using the variable
matching your image (eg `@include sprite($sprites-32x32-my-image);`).
+## The Admin URL
+
+The CMS interface can be accessed by default through the `admin/` URL. You can change this by setting your own [Director routing rule](director#routing-rules) to the `[api:AdminRootController]` and clear the old rule like in the example below.
+
+ :::yml
+ ---
+ Name: myadmin
+ After:
+ - '#adminroutes'
+ ---
+ Director:
+ rules:
+ 'admin': ''
+ 'newAdmin': 'AdminRootController'
+ ---
+
+When extending the CMS or creating modules, you can take advantage of various functions that will return the configured admin URL (by default 'admin/' is returned):
+
+In PHP you should use:
+
+ :::php
+ AdminRootController::admin_url()
+
+When writing templates use:
+
+ :::ss
+ $AdminURL
+
+And in JavaScript, this is avaible through the `ss` namespace
+
+ :::js
+ ss.config.adminUrl
+
+### Multiple Admin URL and overrides
+
+You can also create your own classes that extend the `[api:AdminRootController]` to create multiple or custom admin areas, with a `Director.rules` for each one.
+
## Templates and Controllers
The CMS backend is handled through the [api:LeftAndMain] controller class,
@@ -345,7 +382,7 @@ in a single Ajax request.
<% include CMSBreadcrumbs %>
Static content (not affected by update)
<% include MyRecordInfo %>
-
+
Update record info
@@ -373,7 +410,7 @@ On the client, you can set your preference through the `data-pjax-target` attrib
on links or through the `X-Pjax` header. For firing off an Ajax request that is
tracked in the browser history, use the `pjax` attribute on the state data.
- $('.cms-container').loadPanel('admin/pages', null, {pjax: 'Content'});
+ $('.cms-container').loadPanel(ss.config.adminUrl+'pages', null, {pjax: 'Content'});
## Loading lightweight PJAX fragments
@@ -389,16 +426,16 @@ unrelated to the main flow.
In this case you can use the `loadFragment` call supplied by `LeftAndMain.js`. You can trigger as many of these in
parallel as you want. This will not disturb the main navigation.
- $('.cms-container').loadFragment('admin/foobar/', 'Fragment1');
- $('.cms-container').loadFragment('admin/foobar/', 'Fragment2');
- $('.cms-container').loadFragment('admin/foobar/', 'Fragment3');
+ $('.cms-container').loadFragment(ss.config.adminUrl+'foobar/', 'Fragment1');
+ $('.cms-container').loadFragment(ss.config.adminUrl+'foobar/', 'Fragment2');
+ $('.cms-container').loadFragment(ss.config.adminUrl+'foobar/', 'Fragment3');
The ongoing requests are tracked by the PJAX fragment name (Fragment1, 2, and 3 above) - resubmission will
result in the prior request for this fragment to be aborted. Other parallel requests will continue undisturbed.
You can also load multiple fragments in one request, as long as they are to the same controller (i.e. URL):
- $('.cms-container').loadFragment('admin/foobar/', 'Fragment2,Fragment3');
+ $('.cms-container').loadFragment(ss.config.adminUrl+'foobar/', 'Fragment2,Fragment3');
This counts as a separate request type from the perspective of the request tracking, so will not abort the singular
`Fragment2` nor `Fragment3`.
@@ -419,7 +456,7 @@ You can hook up a response handler that obtains all the details of the XHR reque
Alternatively you can use the jQuery deferred API:
$('.cms-container')
- .loadFragment('admin/foobar/', 'Fragment1')
+ .loadFragment(ss.config.adminUrl+'foobar/', 'Fragment1')
.success(function(data, status, xhr) {
// Say 'success'!
alert(status);
@@ -606,19 +643,19 @@ and load the HTML content into the main view. Example:
-The URL endpoints `admin/mytabs/tab1` and `admin/mytabs/tab2`
+The URL endpoints `{$AdminURL}mytabs/tab1` and `{$AdminURL}mytabs/tab2`
should return HTML fragments suitable for inserting into the content area,
through the `PjaxResponseNegotiator` class (see above).
@@ -629,4 +666,4 @@ through the `PjaxResponseNegotiator` class (see above).
* [Howto: Customise the CMS tree](/developer_guides/customising_the_admin_interface/how_tos/customise_cms_tree)
* [ModelAdmin API](api:ModelAdmin)
* [Reference: Layout](/developer_guides/customising_the_admin_interface/cms_layout)
- * [Rich Text Editing](/developer_guides/forms/field_types/htmleditorfield)
+ * [Rich Text Editing](/developer_guides/forms/field_types/htmleditorfield)
\ No newline at end of file
diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
index dbc61eec8..15d1660b2 100644
--- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
+++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
@@ -26,7 +26,7 @@ code like this:
...
-
+
diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
index cfafde3db..a0e9c6b19 100644
--- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
+++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
@@ -33,10 +33,10 @@ the CMS logic. Add a new section into the `
<% end_loop %>
diff --git a/docs/en/04_Changelogs/4.0.0.md b/docs/en/04_Changelogs/4.0.0.md
index 5b6bd1420..056b332c4 100644
--- a/docs/en/04_Changelogs/4.0.0.md
+++ b/docs/en/04_Changelogs/4.0.0.md
@@ -113,6 +113,7 @@
* `FormField::Title` and `FormField::RightTitle` are now cast as plain text by default (but can be overridden).
* `PopoverField` added to provide popup-menu behaviour in react forms (currently not available for
non-react forms).
+ * Admin URL can now be configured via custom Director routing rule
### Front-end build tooling for CMS interface
@@ -987,3 +988,11 @@ In case you want to keep using RestfulService, you can use `Firesphere/silverstr
Instead of Oembed, the framework now relies on [oscarotero/Embed](https://github.com/oscarotero/Embed) to handle getting the shortcode-data for embedding.
If you have custom embedding-code relying on Oembed, please refer to the documentation provided by oscarotero.
+
+### Admin URL can now be configured via custom Director routing rule
+
+The default `admin/` URL to access the CMS interface can now be changed via a custom Director routing rule for
+`AdminRootController`. If your website or module has hard coded `admin` URLs in PHP, templates or JavaScript, make sure
+to update those with the appropriate function or config call. See
+[CMS architecture](/developer_guides/customising_the_admin_interface/cms-architecture#the-admin-url) for language
+specific functions.
\ No newline at end of file
diff --git a/filesystem/File.php b/filesystem/File.php
index 249b65f87..f3ed555a8 100644
--- a/filesystem/File.php
+++ b/filesystem/File.php
@@ -742,7 +742,12 @@ class File extends DataObject implements ShortcodeHandler, AssetContainer, Thumb
* @return string
*/
public function DeleteLink() {
- return Director::absoluteBaseURL()."admin/assets/removefile/".$this->ID;
+ return Controller::join_links(
+ Director::absoluteBaseURL(),
+ AdminRootController::admin_url(),
+ "assets/removefile/",
+ $this->ID
+ );
}
/**
diff --git a/tests/control/DirectorTest.php b/tests/control/DirectorTest.php
index a78c70966..0f5e427ea 100644
--- a/tests/control/DirectorTest.php
+++ b/tests/control/DirectorTest.php
@@ -366,14 +366,14 @@ class DirectorTest extends SapphireTest {
Director::test('en-nz/myaction/myid/myotherid', null, null, null, null, null, null, $request);
$this->assertEquals(
- $request->params(),
array(
'Controller' => 'DirectorTestRequest_Controller',
'Action' => 'myaction',
'ID' => 'myid',
'OtherID' => 'myotherid',
'Locale' => 'en_NZ'
- )
+ ),
+ $request->params()
);
}