| Index: trunk/phase3/includes/WatchedItem.php |
| — | — | @@ -14,10 +14,10 @@ |
| 15 | 15 | * @todo document |
| 16 | 16 | * @access private |
| 17 | 17 | */ |
| 18 | | - function &fromUserTitle( &$user, &$title ) { |
| | 18 | + static function fromUserTitle( $user, $title ) { |
| 19 | 19 | $wl = new WatchedItem; |
| 20 | | - $wl->mUser =& $user; |
| 21 | | - $wl->mTitle =& $title; |
| | 20 | + $wl->mUser = $user; |
| | 21 | + $wl->mTitle = $title; |
| 22 | 22 | $wl->id = $user->getId(); |
| 23 | 23 | # Patch (also) for email notification on page changes T.Gries/M.Arndt 11.09.2004 |
| 24 | 24 | # TG patch: here we do not consider pages and their talk pages equivalent - why should we ? |
| — | — | @@ -116,18 +116,13 @@ |
| 117 | 117 | * |
| 118 | 118 | * @param Title $ot Page title to duplicate entries from, if present |
| 119 | 119 | * @param Title $nt Page title to add watches on |
| 120 | | - * @static |
| 121 | 120 | */ |
| 122 | | - function duplicateEntries( $ot, $nt ) { |
| | 121 | + static function duplicateEntries( $ot, $nt ) { |
| 123 | 122 | WatchedItem::doDuplicateEntries( $ot->getSubjectPage(), $nt->getSubjectPage() ); |
| 124 | 123 | WatchedItem::doDuplicateEntries( $ot->getTalkPage(), $nt->getTalkPage() ); |
| 125 | 124 | } |
| 126 | 125 | |
| 127 | | - /** |
| 128 | | - * @static |
| 129 | | - * @access private |
| 130 | | - */ |
| 131 | | - function doDuplicateEntries( $ot, $nt ) { |
| | 126 | + private static function doDuplicateEntries( $ot, $nt ) { |
| 132 | 127 | $fname = "WatchedItem::duplicateEntries"; |
| 133 | 128 | $oldnamespace = $ot->getNamespace(); |
| 134 | 129 | $newnamespace = $nt->getNamespace(); |
| Index: trunk/phase3/includes/Image.php |
| — | — | @@ -732,9 +732,8 @@ |
| 733 | 733 | * @param boolean $fromSharedDirectory Should this be in $wgSharedUploadPath? |
| 734 | 734 | * @return string URL of $name image |
| 735 | 735 | * @public |
| 736 | | - * @static |
| 737 | 736 | */ |
| 738 | | - function imageUrl( $name, $fromSharedDirectory = false ) { |
| | 737 | + static function imageUrl( $name, $fromSharedDirectory = false ) { |
| 739 | 738 | global $wgUploadPath,$wgUploadBaseUrl,$wgSharedUploadPath; |
| 740 | 739 | if($fromSharedDirectory) { |
| 741 | 740 | $base = ''; |
| — | — | @@ -1210,7 +1209,6 @@ |
| 1211 | 1210 | |
| 1212 | 1211 | /** |
| 1213 | 1212 | * @return bool |
| 1214 | | - * @static |
| 1215 | 1213 | */ |
| 1216 | 1214 | public static function isHashed( $shared ) { |
| 1217 | 1215 | global $wgHashedUploadDirectory, $wgHashedSharedUploadDirectory; |
| Index: trunk/phase3/includes/SquidUpdate.php |
| — | — | @@ -22,7 +22,7 @@ |
| 23 | 23 | $this->urlArr = $urlArr; |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | | - /* static */ function newFromLinksTo( &$title ) { |
| | 26 | + static function newFromLinksTo( &$title ) { |
| 27 | 27 | $fname = 'SquidUpdate::newFromLinksTo'; |
| 28 | 28 | wfProfileIn( $fname ); |
| 29 | 29 | |
| — | — | @@ -49,7 +49,7 @@ |
| 50 | 50 | return new SquidUpdate( $blurlArr ); |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | | - /* static */ function newFromTitles( &$titles, $urlArr = array() ) { |
| | 53 | + static function newFromTitles( &$titles, $urlArr = array() ) { |
| 54 | 54 | global $wgMaxSquidPurgeTitles; |
| 55 | 55 | if ( count( $titles ) > $wgMaxSquidPurgeTitles ) { |
| 56 | 56 | $titles = array_slice( $titles, 0, $wgMaxSquidPurgeTitles ); |
| — | — | @@ -60,7 +60,7 @@ |
| 61 | 61 | return new SquidUpdate( $urlArr ); |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | | - /* static */ function newSimplePurge( &$title ) { |
| | 64 | + static function newSimplePurge( &$title ) { |
| 65 | 65 | $urlArr = $title->getSquidURLs(); |
| 66 | 66 | return new SquidUpdate( $urlArr ); |
| 67 | 67 | } |
| — | — | @@ -74,7 +74,7 @@ |
| 75 | 75 | (example: $urlArr[] = 'http://my.host/something') |
| 76 | 76 | XXX report broken Squids per mail or log */ |
| 77 | 77 | |
| 78 | | - /* static */ function purge( $urlArr ) { |
| | 78 | + static function purge( $urlArr ) { |
| 79 | 79 | global $wgSquidServers, $wgHTCPMulticastAddress, $wgHTCPPort; |
| 80 | 80 | |
| 81 | 81 | /*if ( (@$wgSquidServers[0]) == 'echo' ) { |
| — | — | @@ -189,7 +189,7 @@ |
| 190 | 190 | wfProfileOut( $fname ); |
| 191 | 191 | } |
| 192 | 192 | |
| 193 | | - /* static */ function HTCPPurge( $urlArr ) { |
| | 193 | + static function HTCPPurge( $urlArr ) { |
| 194 | 194 | global $wgHTCPMulticastAddress, $wgHTCPMulticastTTL, $wgHTCPPort; |
| 195 | 195 | $fname = 'SquidUpdate::HTCPPurge'; |
| 196 | 196 | wfProfileIn( $fname ); |