| Index: branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php |
| — | — | @@ -84,7 +84,7 @@ |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | class ExtMobileFrontend { |
| 88 | | - const VERSION = '0.5.73'; |
| | 88 | + const VERSION = '0.5.74'; |
| 89 | 89 | |
| 90 | 90 | /** |
| 91 | 91 | * @var DOMDocument |
| — | — | @@ -244,7 +244,8 @@ |
| 245 | 245 | $parsedUrl['host'] = str_replace( $wgMobileDomain, '.', $parsedUrl['host'] ); |
| 246 | 246 | $parsedUrl['query'] = $this->removeQueryStringParameter( $parsedUrl['query'], 'useformat' ); |
| 247 | 247 | $fragmentDelimiter = ( !empty( $parsedUrl['fragment'] ) ) ? '#' : ''; |
| 248 | | - self::$viewNormalSiteURL = $parsedUrl['scheme'] . '://' . $parsedUrl['host'] . $parsedUrl['path'] . '?' . $parsedUrl['query'] . $fragmentDelimiter . $parsedUrl['fragment']; |
| | 248 | + $queryDelimiter = ( !empty( $parsedUrl['query'] ) ) ? '?' : ''; |
| | 249 | + self::$viewNormalSiteURL = $parsedUrl['scheme'] . '://' . $parsedUrl['host'] . $parsedUrl['path'] . $queryDelimiter . $parsedUrl['query'] . $fragmentDelimiter . $parsedUrl['fragment']; |
| 249 | 250 | self::$currentURL = $wgRequest->getFullRequestURL(); |
| 250 | 251 | self::$leaveFeedbackURL = $wgRequest->escapeAppendQuery( 'mobileaction=leave_feedback' ); |
| 251 | 252 | |