| Index: branches/wmf/1.17wmf1/includes/RecentChange.php |
| — | — | @@ -644,7 +644,9 @@ |
| 645 | 645 | // XXX: *HACK^2* the preg_replace() undoes much of what getInternalURL() does, but we |
| 646 | 646 | // XXX: need to call it so that URL paths on the Wikimedia secure server can be fixed |
| 647 | 647 | // XXX: by a custom GetInternalURL hook --vyznev 2008-12-10 |
| 648 | | - $url = preg_replace( '/title=[^&]*&/', '', $titleObj->getInternalURL( $url ) ); |
| | 648 | + // XXX: Also, getInternalUrl() may return a protocol-relative URL. |
| | 649 | + // XXX: In that case, expand it to an HTTP URL, even if this is an HTTPS request --catrope 2011-08-17 |
| | 650 | + $url = preg_replace( '/title=[^&]*&/', '', wfExpandUrl( $titleObj->getInternalURL( $url ), PROTO_HTTP ) ); |
| 649 | 651 | } |
| 650 | 652 | |
| 651 | 653 | if( isset( $oldSize ) && isset( $newSize ) ) { |
| Property changes on: branches/wmf/1.17wmf1/includes/RecentChange.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 652 | 654 | Merged /branches/REL1_15/phase3/includes/RecentChange.php:r51646 |
| 653 | 655 | Merged /branches/wmf/1.16wmf4/includes/RecentChange.php:r67177,69199,76243,77266 |
| 654 | 656 | Merged /branches/sqlite/includes/RecentChange.php:r58211-58321 |
| 655 | 657 | Merged /trunk/phase3/includes/RecentChange.php:r83590,89512-89513,94754 |
| 656 | 658 | Merged /branches/new-installer/phase3/includes/RecentChange.php:r43664-66004 |
| 657 | 659 | Merged /branches/wmf-deployment/includes/RecentChange.php:r53381,60970 |