Commit5d12f0c

committed

fixed absolute url generation for query strings

1 parentda35163 commit5d12f0cCopy full SHA for 5d12f0c

File tree

+25

-0

lines changed

+25

-0

lines changed

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,15 @@ public function generateAbsoluteUrl($path)`
`70`	`70`	`$port =':'.$this->requestContext->getHttpsPort();`
`71`	`71`	`}`
`72`	`72`
	`73`	`+if ('#' ===$path[0]) {`
	`74`	`+$queryString =$this->requestContext->getQueryString();`
	`75`	`+$path =$this->requestContext->getPathInfo().($queryString ?'?'.$queryString :'').$path;`
	`76`	`+ }`
	`77`	`+`
	`78`	`+if ('?' ===$path[0]) {`
	`79`	`+$path =$this->requestContext->getPathInfo().$path;`
	`80`	`+ }`
	`81`	`+`
`73`	`82`	`if ('/' !==$path[0]) {`
`74`	`83`	`$path =rtrim($this->requestContext->getBaseUrl(),'/').'/'.$path;`
`75`	`84`	`}`
`@@ -80,6 +89,14 @@ public function generateAbsoluteUrl($path)`
`80`	`89`	`return$path;`
`81`	`90`	`}`
`82`	`91`
	`92`	`+if ('#' ===$path[0]) {`
	`93`	`+$path =$request->getRequestUri().$path;`
	`94`	`+ }`
	`95`	`+`
	`96`	`+if ('?' ===$path[0]) {`
	`97`	`+$path =$request->getPathInfo().$path;`
	`98`	`+ }`
	`99`	`+`
`83`	`100`	`if (!$path \|\|'/' !==$path[0]) {`
`84`	`101`	`$prefix =$request->getPathInfo();`
`85`	`102`	`$last =strlen($prefix) -1;`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,14 @@ public function getGenerateAbsoluteUrlData()`
`42`	`42`	`array('http://example.com/baz','http://example.com/baz','/'),`
`43`	`43`	`array('https://example.com/baz','https://example.com/baz','/'),`
`44`	`44`	`array('//example.com/baz','//example.com/baz','/'),`
	`45`	`+`
	`46`	`+array('http://localhost/foo/bar?baz','?baz','/foo/bar'),`
	`47`	`+array('http://localhost/foo/bar?baz=1','?baz=1','/foo/bar?foo=1'),`
	`48`	`+array('http://localhost/foo/baz?baz=1','baz?baz=1','/foo/bar?foo=1'),`
	`49`	`+`
	`50`	`+array('http://localhost/foo/bar#baz','#baz','/foo/bar'),`
	`51`	`+array('http://localhost/foo/bar?baz=1#baz','?baz=1#baz','/foo/bar?foo=1'),`
	`52`	`+array('http://localhost/foo/baz?baz=1#baz','baz?baz=1#baz','/foo/bar?foo=1'),`
`45`	`53`	`);`
`46`	`54`	`}`
`47`	`55`

Comments

(0)