tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-05 15:48:31 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4634 from spekulatius/remove-trailing-spaces

Browse Source 
remove trailing spaces in the codebase
This commit is contained in:
Will Morgan 2015-09-28 11:16:42 +01:00
commit ecf06f9130
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
control/Cookie_Backend.php
View File

@ -18,7 +18,7 @@ interface Cookie_Backend {
* @param array $cookies The existing cookies to load into the cookie jar * @param array $cookies The existing cookies to load into the cookie jar
*/ */
public function __construct($cookies = array()); public function __construct($cookies = array());
/** /**
* Set a cookie * Set a cookie
* *
@ -31,7 +31,7 @@ interface Cookie_Backend {
* @param boolean $httpOnly Prevent the cookie being accessible by JS * @param boolean $httpOnly Prevent the cookie being accessible by JS
*/ */
public function set($name, $value, $expiry = 90, $path = null, $domain = null, $secure = false, $httpOnly = true); public function set($name, $value, $expiry = 90, $path = null, $domain = null, $secure = false, $httpOnly = true);
/** /**
* Get the cookie value by name * Get the cookie value by name
* *
@ -41,7 +41,7 @@ interface Cookie_Backend {
* @return string|null The cookie value or null if unset * @return string|null The cookie value or null if unset
*/ */
public function get($name, $includeUnsent = true); public function get($name, $includeUnsent = true);
/** /**
* Get all the cookies * Get all the cookies
* *
@ -49,7 +49,7 @@ interface Cookie_Backend {
* @return array All the cookies * @return array All the cookies
*/ */
public function getAll($includeUnsent = true); public function getAll($includeUnsent = true);
/** /**
* Force the expiry of a cookie by name * Force the expiry of a cookie by name
* *

2
control/Director.php
View File

@ -442,7 +442,7 @@ class Director implements TemplateGlobalProvider {
if ($url == '.' || $url == './') { if ($url == '.' || $url == './') {
$url = ''; $url = '';
} }
if(strpos($url,'/') === false && !$relativeToSiteBase) { if(strpos($url,'/') === false && !$relativeToSiteBase) {
//if there's no URL we want to force a trailing slash on the link //if there's no URL we want to force a trailing slash on the link
if (!$url) { if (!$url) {

2
control/FlushRequestFilter.php
View File

@ -15,7 +15,7 @@ class FlushRequestFilter implements RequestFilter {
} }
return true; return true;
} }
public function postRequest(SS_HTTPRequest $request, SS_HTTPResponse $response, DataModel $model) { public function postRequest(SS_HTTPRequest $request, SS_HTTPResponse $response, DataModel $model) {
return true; return true;

2
control/HTTP.php
View File

@ -378,7 +378,7 @@ class HTTP {
// (http://support.microsoft.com/kb/323308) // (http://support.microsoft.com/kb/323308)
// Note: this is also fixable by ticking "Do not save encrypted pages to disk" in advanced options. // Note: this is also fixable by ticking "Do not save encrypted pages to disk" in advanced options.
$cacheControlHeaders['max-age'] = 3; $cacheControlHeaders['max-age'] = 3;
// Set empty pragma to avoid PHP's session_cache_limiter adding conflicting caching information, // Set empty pragma to avoid PHP's session_cache_limiter adding conflicting caching information,
// defaulting to "nocache" on most PHP configurations (see http://php.net/session_cache_limiter). // defaulting to "nocache" on most PHP configurations (see http://php.net/session_cache_limiter).
// Since it's a deprecated HTTP 1.0 option, all modern HTTP clients and proxies should // Since it's a deprecated HTTP 1.0 option, all modern HTTP clients and proxies should

6
control/injector/Injector.php
View File

@ -180,11 +180,11 @@ class Injector {
* @var Factory * @var Factory
*/ */
protected $objectCreator; protected $objectCreator;
/** /**
* Locator for determining Config properties for services * Locator for determining Config properties for services
* *
* @var ServiceConfigurationLocator * @var ServiceConfigurationLocator
*/ */
protected $configLocator; protected $configLocator;

6
control/injector/ServiceConfigurationLocator.php
View File

@ -9,11 +9,11 @@
* @subpackage injector * @subpackage injector
*/ */
class ServiceConfigurationLocator { class ServiceConfigurationLocator {
/** /**
* Finds the Injector config for a named service. * Finds the Injector config for a named service.
* *
* @param string $name * @param string $name
* @return mixed * @return mixed
*/ */