Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow for the use of PATH_INFO #196

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Allow for the use of PATH_INFO #196

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d315d8
Allow for the use of PATH_INFO
kennydude Mar 23, 2014
183c751
Fix Travis CI warning
kennydude Mar 23, 2014
57d9584
hopefully nailed it
kennydude Mar 23, 2014
cd5ce9b
Update Request.php
kennydude Oct 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Klein/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,11 @@ public function userAgent()
*/
public function uri()
{
return $this->server->get('REQUEST_URI', '/');
$p = $this->server->get('PATH_INFO');
if (!$p) {
$p = $this->server->get('REQUEST_URI', '/');
}
return $p;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, a few things here:

  • You should use a variable name that has meaning, it makes it easier to read. Maybe $uri.
  • The conditional should be a bit more explicit, it should check for !empty($uri)
  • You should have new-line separation wrapping the block, so one before the if and after the closing brace

}

/**
Expand Down