| Index: trunk/phase3/thumb_handler.php |
| — | — | @@ -49,15 +49,6 @@ |
| 50 | 50 | return; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | | - # Check any backend caches for the thumbnail... |
| 54 | | - if ( isset( $thgThumbCallbacks['checkCache'] ) |
| 55 | | - && is_callable( $thgThumbCallbacks['checkCache'] ) ) |
| 56 | | - { |
| 57 | | - if ( call_user_func_array( $thgThumbCallbacks['checkCache'], array( $uri, $params ) ) ) { |
| 58 | | - return; // file streamed from backend thumb cache |
| 59 | | - } |
| 60 | | - } |
| 61 | | - |
| 62 | 53 | # Obtain and stream the thumbnail or setup for wfThumbMain() call... |
| 63 | 54 | if ( $thgThumbCurlConfig['enabled'] ) { |
| 64 | 55 | wfStreamThumbViaCurl( $params, $uri ); |
| — | — | @@ -110,6 +101,15 @@ |
| 111 | 102 | function wfStreamThumbViaCurl( array $params, $uri ) { |
| 112 | 103 | global $thgThumbCallbacks, $thgThumbCurlConfig; |
| 113 | 104 | |
| | 105 | + # Check any backend caches for the thumbnail... |
| | 106 | + if ( isset( $thgThumbCallbacks['checkCache'] ) |
| | 107 | + && is_callable( $thgThumbCallbacks['checkCache'] ) ) |
| | 108 | + { |
| | 109 | + if ( call_user_func_array( $thgThumbCallbacks['checkCache'], array( $uri, $params ) ) ) { |
| | 110 | + return; // file streamed from backend thumb cache |
| | 111 | + } |
| | 112 | + } |
| | 113 | + |
| 114 | 114 | if ( !extension_loaded( 'curl' ) ) { |
| 115 | 115 | die( "cURL is not enabled for PHP on this wiki.\n" ); // sanity |
| 116 | 116 | } |