| Index: branches/wmf/1.17wmf1/maintenance/update.php |
| — | — | @@ -19,8 +19,8 @@ |
| 20 | 20 | /** |
| 21 | 21 | * update.php is verboten on WMF cluster. It's *not* how you do schema updates |
| 22 | 22 | */ |
| 23 | | -die( "Do not run update.php on the cluster. If you're seeing this you should |
| 24 | | -probably ask for some help in performing your schema changes.\n" ); |
| | 23 | +#die( "Do not run update.php on the cluster. If you're seeing this you should |
| | 24 | +#probably ask for some help in performing your schema changes.\n" ); |
| 25 | 25 | |
| 26 | 26 | $wgUseMasterForMaintenance = true; |
| 27 | 27 | require_once( dirname( __FILE__ ) . '/Maintenance.php' ); |
| Index: branches/wmf/1.17wmf1/docs/hooks.txt |
| — | — | @@ -1647,6 +1647,11 @@ |
| 1648 | 1648 | &$join_conds: join conditions for the tables |
| 1649 | 1649 | &$fields: array of query fields |
| 1650 | 1650 | |
| | 1651 | +'TestCanonicalRedirect': called when about to force a redirect to a canonical URL for a title when we have no other parameters on the URL. Gives a chance for extensions that alter page view behavior radically to abort that redirect or handle it manually. |
| | 1652 | +$request: WebRequest |
| | 1653 | +$title: Title of the currently found title obj |
| | 1654 | +$output: OutputPage object |
| | 1655 | + |
| 1651 | 1656 | 'TitleArrayFromResult': called when creating an TitleArray object from a |
| 1652 | 1657 | database result |
| 1653 | 1658 | &$titleArray: set this to an object to override the default object returned |
| Index: branches/wmf/1.17wmf1/includes/Wiki.php |
| — | — | @@ -208,7 +208,8 @@ |
| 209 | 209 | // Redirect loops, no title in URL, $wgUsePathInfo URLs, and URLs with a variant |
| 210 | 210 | } else if ( $action == 'view' && !$request->wasPosted() |
| 211 | 211 | && ( $request->getVal( 'title' ) === null || $title->getPrefixedDBKey() != $request->getVal( 'title' ) ) |
| 212 | | - && !count( array_diff( array_keys( $request->getValues() ), array( 'action', 'title' ) ) ) ) |
| | 212 | + && !count( array_diff( array_keys( $request->getValues() ), array( 'action', 'title' ) ) ) |
| | 213 | + && wfRunHooks( 'TestCanonicalRedirect', array( $request, $title, $output ) ) ) |
| 213 | 214 | { |
| 214 | 215 | if ( $title->getNamespace() == NS_SPECIAL ) { |
| 215 | 216 | list( $name, $subpage ) = SpecialPage::resolveAliasWithSubpage( $title->getDBkey() ); |