| Index: trunk/phase3/includes/RecentChange.php |
| — | — | @@ -589,8 +589,7 @@ |
| 590 | 590 | } |
| 591 | 591 | |
| 592 | 592 | protected function getIRCLine() { |
| 593 | | - global $wgUseRCPatrol, $wgUseNPPatrol, $wgRC2UDPInterwikiPrefix, $wgLocalInterwiki, |
| 594 | | - $wgServer, $wgScript, $wgRC2UDPScriptUrl; |
| | 593 | + global $wgUseRCPatrol, $wgUseNPPatrol, $wgRC2UDPInterwikiPrefix, $wgLocalInterwiki; |
| 595 | 594 | |
| 596 | 595 | // FIXME: Would be good to replace these 2 extract() calls with something more explicit |
| 597 | 596 | // e.g. list ($rc_type, $rc_id) = array_values ($this->mAttribs); [or something like that] |
| — | — | @@ -605,26 +604,22 @@ |
| 606 | 605 | $title = $titleObj->getPrefixedText(); |
| 607 | 606 | $title = self::cleanupForIRC( $title ); |
| 608 | 607 | |
| 609 | | - // XXX: This used to call Title::getInternalURL() and then strip out the title, but that's |
| 610 | | - // a lot of complex code just to prepend two globals to a query string. Simplified. |
| 611 | 608 | if( $rc_type == RC_LOG ) { |
| 612 | 609 | $url = ''; |
| 613 | 610 | } else { |
| 614 | | - if( $wgRC2UDPScriptUrl !== false ) { |
| 615 | | - $url = $wgRC2UDPScriptUrl; |
| 616 | | - } else { |
| 617 | | - $url = $wgServer . $wgScript; |
| 618 | | - } |
| 619 | | - |
| 620 | 611 | if( $rc_type == RC_NEW ) { |
| 621 | | - $url .= "?oldid=$rc_this_oldid"; |
| | 612 | + $url = "oldid=$rc_this_oldid"; |
| 622 | 613 | } else { |
| 623 | | - $url .= "?diff=$rc_this_oldid&oldid=$rc_last_oldid"; |
| | 614 | + $url = "diff=$rc_this_oldid&oldid=$rc_last_oldid"; |
| 624 | 615 | } |
| 625 | | - |
| 626 | 616 | if( $wgUseRCPatrol || ($rc_type == RC_NEW && $wgUseNPPatrol) ) { |
| 627 | 617 | $url .= "&rcid=$rc_id"; |
| 628 | 618 | } |
| | 619 | + // XXX: *HACK* this should use getFullURL(), hacked for SSL madness --brion 2005-12-26 |
| | 620 | + // XXX: *HACK^2* the preg_replace() undoes much of what getInternalURL() does, but we |
| | 621 | + // XXX: need to call it so that URL paths on the Wikimedia secure server can be fixed |
| | 622 | + // XXX: by a custom GetInternalURL hook --vyznev 2008-12-10 |
| | 623 | + $url = preg_replace( '/title=[^&]*&/', '', $titleObj->getInternalURL( $url ) ); |
| 629 | 624 | } |
| 630 | 625 | |
| 631 | 626 | if( isset( $oldSize ) && isset( $newSize ) ) { |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -2143,13 +2143,6 @@ |
| 2144 | 2144 | $wgRC2UDPInterwikiPrefix = false; |
| 2145 | 2145 | |
| 2146 | 2146 | /** |
| 2147 | | - * This prefix is prepended to each URL in the IRC feed. If left false, the prefix |
| 2148 | | - * $wgServer . $wgScript is used by default. You should set this if your $wgServer |
| 2149 | | - * or $wgScript might vary, e.g. if your wiki can be reached via both HTTP and HTTPS. |
| 2150 | | - */ |
| 2151 | | -$wgRC2UDPScriptUrl = false; |
| 2152 | | - |
| 2153 | | -/** |
| 2154 | 2147 | * Set to true to omit "bot" edits (by users with the bot permission) from the |
| 2155 | 2148 | * UDP feed. |
| 2156 | 2149 | */ |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -70,9 +70,6 @@ |
| 71 | 71 | using $wgUsePrivateIPs. |
| 72 | 72 | * (bug 11009) The null file (ie: /dev/null) can be configured with $wgNullFile. |
| 73 | 73 | Useful for overriding if the normal file isn't accessible |
| 74 | | -* $wgRC2UDPScriptUrl can be used to set the prefix for URLs in the RC->IRC feed |
| 75 | | - where enabled. The default is $wgServer . $wgScript (used to effectively be |
| 76 | | - $wgInternalServer . $wgScript). |
| 77 | 74 | |
| 78 | 75 | === Migrated extensions === |
| 79 | 76 | The following extensions are migrated into MediaWiki 1.14: |