| Index: trunk/phase3/includes/ProxyTools.php |
| — | — | @@ -195,12 +195,11 @@ |
| 196 | 196 | */ |
| 197 | 197 | function wfIsLocallyBlockedProxy( $ip ) { |
| 198 | 198 | global $wgProxyList; |
| 199 | | - $fname = 'wfIsLocallyBlockedProxy'; |
| 200 | 199 | |
| 201 | 200 | if ( !$wgProxyList ) { |
| 202 | 201 | return false; |
| 203 | 202 | } |
| 204 | | - wfProfileIn( $fname ); |
| | 203 | + wfProfileIn( __METHOD__ ); |
| 205 | 204 | |
| 206 | 205 | if ( !is_array( $wgProxyList ) ) { |
| 207 | 206 | # Load from the specified file |
| — | — | @@ -217,7 +216,7 @@ |
| 218 | 217 | } else { |
| 219 | 218 | $ret = false; |
| 220 | 219 | } |
| 221 | | - wfProfileOut( $fname ); |
| | 220 | + wfProfileOut( __METHOD__ ); |
| 222 | 221 | return $ret; |
| 223 | 222 | } |
| 224 | 223 | |
| Index: trunk/phase3/includes/SiteStats.php |
| — | — | @@ -204,7 +204,6 @@ |
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | function doUpdate() { |
| 208 | | - $fname = 'SiteStatsUpdate::doUpdate'; |
| 209 | 208 | $dbw = wfGetDB( DB_MASTER ); |
| 210 | 209 | |
| 211 | 210 | $updates = ''; |
| — | — | @@ -221,7 +220,7 @@ |
| 222 | 221 | |
| 223 | 222 | # Need a separate transaction because this a global lock |
| 224 | 223 | $dbw->begin(); |
| 225 | | - $dbw->query( $sql, $fname ); |
| | 224 | + $dbw->query( $sql, __METHOD__ ); |
| 226 | 225 | $dbw->commit(); |
| 227 | 226 | } |
| 228 | 227 | } |