| Index: trunk/phase3/includes/Image.php |
| — | — | @@ -1361,7 +1361,8 @@ |
| 1362 | 1362 | $urls = array(); |
| 1363 | 1363 | foreach ( $files as $file ) { |
| 1364 | 1364 | if ( preg_match( '/^(\d+)px/', $file, $m ) ) { |
| 1365 | | - $urls[] = $this->thumbUrl( $m[1], $this->fromSharedDirectory ); |
| | 1365 | + list( $isScriptUrl, $url ) = $this->thumbUrl( $m[1] ); |
| | 1366 | + $urls[] = $url; |
| 1366 | 1367 | @unlink( "$dir/$file" ); |
| 1367 | 1368 | } |
| 1368 | 1369 | } |
| Index: trunk/phase3/includes/SquidUpdate.php |
| — | — | @@ -201,9 +201,11 @@ |
| 202 | 202 | $htcpOpCLR = 4; // HTCP CLR |
| 203 | 203 | |
| 204 | 204 | // FIXME PHP doesn't support these socket constants (include/linux/in.h) |
| 205 | | - define( "IPPROTO_IP", 0 ); |
| 206 | | - define( "IP_MULTICAST_LOOP", 34 ); |
| 207 | | - define( "IP_MULTICAST_TTL", 33 ); |
| | 205 | + if( !defined( "IPPROTO_IP" ) ) { |
| | 206 | + define( "IPPROTO_IP", 0 ); |
| | 207 | + define( "IP_MULTICAST_LOOP", 34 ); |
| | 208 | + define( "IP_MULTICAST_TTL", 33 ); |
| | 209 | + } |
| 208 | 210 | |
| 209 | 211 | // pfsockopen doesn't work because we need set_sock_opt |
| 210 | 212 | $conn = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP ); |
| — | — | @@ -215,6 +217,9 @@ |
| 216 | 218 | $wgHTCPMulticastTTL ); |
| 217 | 219 | |
| 218 | 220 | foreach ( $urlArr as $url ) { |
| | 221 | + if( !is_string( $url ) ) { |
| | 222 | + wfDebugDieBacktrace( 'Bad purge URL' ); |
| | 223 | + } |
| 219 | 224 | $url = SquidUpdate::expand( $url ); |
| 220 | 225 | |
| 221 | 226 | // Construct a minimal HTCP request diagram |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -51,6 +51,7 @@ |
| 52 | 52 | * Fix regression in autoconfirm permission check |
| 53 | 53 | * (bug 3015) Add CSS ids to subcategory and page sections on category pages |
| 54 | 54 | * (bug 7587) Fix erroneous id for specialpage tab, enabling informative popup |
| | 55 | +* (bug 7599) Fix thumbnail purging, PHP notices on HTCP image page purge |
| 55 | 56 | |
| 56 | 57 | |
| 57 | 58 | == Languages updated == |