bug-245.patch
| b/application/libraries/Router.php | ||
|---|---|---|
| 224 | 224 |
if ( $siteType == null ) {
|
| 225 | 225 |
$siteType = $this->getSiteType(); |
| 226 | 226 |
} |
| 227 |
if ( strpos( $module, '/' ) === false ) {
|
|
| 227 |
if ( preg_match( '@(?:/|#|\?)@', $module ) == false ) {
|
|
| 228 | 228 |
$url = new Router_Url; |
| 229 | 229 |
$url->siteType( $siteType ) |
| 230 | 230 |
->module( $module ) |
| ... | ... | |
| 249 | 249 |
* @return string |
| 250 | 250 |
*/ |
| 251 | 251 |
public function makeFullUrl( $module, $controller=null, $action=null, $siteType=null, $arguments=array(), $useHttps=null ) {
|
| 252 |
return $this->makeUrl( $module, $controller, $action, $siteType, $arguments )->makeFull( '&', null, $useHttps ); |
|
| 252 |
return $this->makeUrl( $module, $controller, $action, $siteType, $arguments ) |
|
| 253 |
->makeFull( '&', null, $useHttps ); |
|
| 253 | 254 |
} |
| 254 | 255 | |
| 255 | 256 |
/** |