tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

APICHANGE: changed BaseHref to AbsoluteBaseURL for consistency. FEATURE: added BaseURL for getting non absolute value. PATCH via muzdowski (#6158) 

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114815 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Will Rossiter 2010-12-11 02:01:13 +00:00
parent ac851e6f82
commit 21f84c9513
4 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/ViewableData.php
View File

@ -22,8 +22,7 @@ class ViewableData extends Object implements IteratorAggregate {
*
* @var array
*/
public static $casting = array (
'BaseHref' => 'Varchar',
public static $casting = array(
'CSSClasses' => 'Varchar'
);
@ -712,11 +711,34 @@ class ViewableData extends Object implements IteratorAggregate {
/**
* @see Director::absoluteBaseURL()
*
* @deprecated 3.0
*/
public function BaseHref() {
user_error("Please use AbsoluteBaseURL", E_USER_WARNING);
return $this->AbsoluteBaseURL();
}
/**
* Returns the absolute base url
*
* @return string
*/
public function AbsoluteBaseURL() {
return Director::absoluteBaseURL();
}
/**
* Access the BaseURL from template: proxy the value from the Director.
* Needed for building hardcoded links.
*
* @return string base url
*/
function BaseURL() {
return Director::baseURL();
}
/**
* @see Director::is_ajax()
*/

2
templates/email/ChangePasswordEmail.ss
View File

@ -1,7 +1,7 @@
<p><% _t('HELLO', 'Hi') %> $FirstName,</p>
<p>
<% _t('CHANGEPASSWORDTEXT1', 'You changed your password for', PR_MEDIUM, 'for a url') %> $BaseHref.<br />
<% _t('CHANGEPASSWORDTEXT1', 'You changed your password for', PR_MEDIUM, 'for a url') %> $AbsoluteBaseURL.<br />
<% _t('CHANGEPASSWORDTEXT2', 'You can now use the following credentials to log in:') %>
</p>

2
templates/email/ForgotPasswordEmail.ss
View File

@ -1,4 +1,4 @@
<p><% _t('HELLO', 'Hi') %> $FirstName,</p>
<p><% _t('TEXT1', 'Here is your') %> <a href="$PasswordResetLink"><% _t('TEXT2', 'password reset link') %></a> <% _t('TEXT3', 'for') %> $BaseHref.</p>
<p><% _t('TEXT1', 'Here is your') %> <a href="$PasswordResetLink"><% _t('TEXT2', 'password reset link') %></a> <% _t('TEXT3', 'for') %> $AbsoluteBaseURL.</p>

6
tests/ControllerTest.php
View File

@ -130,6 +130,10 @@ class ControllerTest extends FunctionalTest {
);
}
public function testBaseURL() {
Director::setBaseURL('/baseurl/');
$this->assertEquals(Controller::BaseURL(), Director::BaseURL());
}
}
/**
@ -210,4 +214,4 @@ class ControllerTest_HasAction_Unsecured extends ControllerTest_HasAction {
public function defined_action() { }
}
}