| Index: trunk/phase3/includes/RecentChange.php |
| — | — | @@ -590,7 +590,7 @@ |
| 591 | 591 | |
| 592 | 592 | protected function getIRCLine() { |
| 593 | 593 | global $wgUseRCPatrol, $wgUseNPPatrol, $wgRC2UDPInterwikiPrefix, $wgLocalInterwiki, |
| 594 | | - $wgInternalServer, $wgScript; |
| | 594 | + $wgServer, $wgScript, $wgRC2UDPScriptUrl; |
| 595 | 595 | |
| 596 | 596 | // FIXME: Would be good to replace these 2 extract() calls with something more explicit |
| 597 | 597 | // e.g. list ($rc_type, $rc_id) = array_values ($this->mAttribs); [or something like that] |
| — | — | @@ -610,13 +610,18 @@ |
| 611 | 611 | if( $rc_type == RC_LOG ) { |
| 612 | 612 | $url = ''; |
| 613 | 613 | } else { |
| 614 | | - // XXX: *HACK* this should use $wgServer, hacked for SSL madness --brion 2005-12-26 |
| 615 | | - $url = $wgInternalServer . $wgScript; |
| | 614 | + if( $wgRC2UDPScriptUrl !== false ) { |
| | 615 | + $url = $wgRC2UDPScriptUrl; |
| | 616 | + } else { |
| | 617 | + $url = $wgServer . $wgScript; |
| | 618 | + } |
| | 619 | + |
| 616 | 620 | if( $rc_type == RC_NEW ) { |
| 617 | 621 | $url .= "?oldid=$rc_this_oldid"; |
| 618 | 622 | } else { |
| 619 | 623 | $url .= "?diff=$rc_this_oldid&oldid=$rc_last_oldid"; |
| 620 | 624 | } |
| | 625 | + |
| 621 | 626 | if( $wgUseRCPatrol || ($rc_type == RC_NEW && $wgUseNPPatrol) ) { |
| 622 | 627 | $url .= "&rcid=$rc_id"; |
| 623 | 628 | } |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -2143,6 +2143,13 @@ |
| 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 | +/** |
| 2147 | 2154 | * Set to true to omit "bot" edits (by users with the bot permission) from the |
| 2148 | 2155 | * UDP feed. |
| 2149 | 2156 | */ |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -70,6 +70,9 @@ |
| 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). |
| 74 | 77 | |
| 75 | 78 | === Migrated extensions === |
| 76 | 79 | The following extensions are migrated into MediaWiki 1.14: |