Skip to content

Commit

Permalink
MINOR Spelling corrections to Director comments (from r111123)
Browse files Browse the repository at this point in the history
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112896 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information
Sam Minnee committed Oct 19, 2010
1 parent 8d0253a commit b573414
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions core/control/Director.php
Expand Up @@ -61,7 +61,7 @@ static function history($pagesBack = 1) {
/**
* Add URL matching rules to the Director.
*
* The director is responsible for turning URLs into Controller objects. It does thi
* The director is responsible for turning URLs into Controller objects.
*
* @param $priority The priority of the rules; higher values will get your rule checked first.
* We recommend priority 100 for your site's rules. The built-in rules are priority 10, standard modules are priority 50.
Expand All @@ -73,7 +73,7 @@ static function addRules($priority, $rules) {
/**
* Process the given URL, creating the appropriate controller and executing it.
*
* Request processing is handled as folows:
* Request processing is handled as follows:
* - Director::direct() creates a new SS_HTTPResponse object and passes this to Director::handleRequest().
* - Director::handleRequest($request) checks each of the Director rules and identifies a controller to handle this
* request.
Expand Down Expand Up @@ -162,7 +162,7 @@ static function direct($url) {
* @param string $url The URL to visit
* @param array $postVars The $_POST & $_FILES variables
* @param Session $session The {@link Session} object representing the current session. By passing the same object to multiple
* calls of Director::test(), you can simulate a peristed session.
* calls of Director::test(), you can simulate a persisted session.
* @param string $httpMethod The HTTP method, such as GET or POST. It will default to POST if postVars is set, GET otherwise.
* Overwritten by $postVars['_method'] if present.
* @param string $body The HTTP body
Expand All @@ -175,7 +175,7 @@ static function direct($url) {
*/
static function test($url, $postVars = null, $session = null, $httpMethod = null, $body = null, $headers = null, $cookies = null) {
// These are needed so that calling Director::test() doesnt muck with whoever is calling it.
// Really, it's some inapproriate coupling and should be resolved by making less use of statics
// Really, it's some inappropriate coupling and should be resolved by making less use of statics
$oldStage = Versioned::current_stage();
$getVars = array();

Expand Down Expand Up @@ -234,7 +234,7 @@ static function test($url, $postVars = null, $session = null, $httpMethod = null
Requirements::set_backend($existingRequirementsBackend);

// These are needed so that calling Director::test() doesnt muck with whoever is calling it.
// Really, it's some inapproriate coupling and should be resolved by making less use of statics
// Really, it's some inappropriate coupling and should be resolved by making less use of statics
Versioned::reading_stage($oldStage);

return $result;
Expand Down Expand Up @@ -321,7 +321,7 @@ static function setUrlParams($params) {
}

/**
* Return the {@link SiteTree} object that is currently being viewed. If there is no sitetree object to return,
* Return the {@link SiteTree} object that is currently being viewed. If there is no SiteTree object to return,
* then this will return the current controller.
*
* @return SiteTree
Expand Down Expand Up @@ -904,5 +904,4 @@ static function isTest() {
return false;
}

}
?>
}

0 comments on commit b573414

Please sign in to comment.