| Index: branches/wmf-deployment/extensions/TorBlock/TorBlock.class.php |
| — | — | @@ -5,7 +5,7 @@ |
| 6 | 6 | class TorBlock { |
| 7 | 7 | public static $mExitNodes; |
| 8 | 8 | |
| 9 | | - public static function onGetUserPermissionsErrorsExpensive( &$title, &$user, $action, &$result ) { |
| | 9 | + public static function onGetUserPermissionsErrorsExpensive( &$title, &$user, &$action, &$result ) { |
| 10 | 10 | global $wgTorAllowedActions; |
| 11 | 11 | if (in_array( $action, $wgTorAllowedActions)) { |
| 12 | 12 | return true; |
| Index: branches/wmf-deployment/includes/LinksUpdate.php |
| — | — | @@ -673,13 +673,6 @@ |
| 674 | 674 | function getTitle() { |
| 675 | 675 | return $this->mTitle; |
| 676 | 676 | } |
| 677 | | - |
| 678 | | - /** |
| 679 | | - * Return the list of images used as generated by the parser |
| 680 | | - */ |
| 681 | | - public function getImages() { |
| 682 | | - return $this->mImages; |
| 683 | | - } |
| 684 | 677 | |
| 685 | 678 | /** |
| 686 | 679 | * Invalidate any necessary link lists related to page property changes |
| Property changes on: branches/wmf-deployment/includes/LinksUpdate.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 687 | 680 | - /branches/REL1_15/phase3/includes/LinksUpdate.php:51646 |
| /branches/wmf-deployment/includes/LinksUpdate.php:53381 |
| /trunk/phase3/includes/LinksUpdate.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57530,57602,58658 |