jarednova / timber

lib/image/timber-image-operation-retina.php

Braces +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
      *                               (ex: /src/var/www/wp-content/uploads/my-pic@2x.jpg)
      * @return bool                  true if everything went fine, false otherwise
      */
-    function run($load_filename, $save_filename){
+    function run($load_filename, $save_filename) {
         $image = wp_get_image_editor( $load_filename );
         if ( !is_wp_error( $image ) ) {
             $current_size = $image->get_size();

Indentation +55 added lines, -55 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * Contains the class for running image retina-izing operations
- */
+	 * Contains the class for running image retina-izing operations
+	 */
 
 /**
  * Increases image size by a given factor
@@ -11,64 +11,64 @@ 
  */
 class TimberImageOperationRetina extends TimberImageOperation {
 
-    private $factor;
+	private $factor;
 
-    /**
-     * Construct our operation
-     * @param float   $factor to multiply original dimensions by
-     */
-    function __construct($factor) {
-        $this->factor = $factor;
-    }
+	/**
+	 * Construct our operation
+	 * @param float   $factor to multiply original dimensions by
+	 */
+	function __construct($factor) {
+		$this->factor = $factor;
+	}
 
-    /**
-     * Generates the final filename based on the source's name and extension
-     *
-     * @param   string    $src_filename     the basename of the file (ex: my-awesome-pic)
-     * @param   string    $src_extension    the extension (ex: .jpg)
-     * @return  string    the final filename to be used (ex: my-awesome-pic@2x.jpg)
-     */
-    function filename($src_filename, $src_extension) {
-        $newbase = $src_filename . '@' . $this->factor . 'x'; // add @2x, @3x, @1.5x, etc.
-        $new_name = $newbase . '.' . $src_extension;
-        return $new_name;
-    }
+	/**
+	 * Generates the final filename based on the source's name and extension
+	 *
+	 * @param   string    $src_filename     the basename of the file (ex: my-awesome-pic)
+	 * @param   string    $src_extension    the extension (ex: .jpg)
+	 * @return  string    the final filename to be used (ex: my-awesome-pic@2x.jpg)
+	 */
+	function filename($src_filename, $src_extension) {
+		$newbase = $src_filename . '@' . $this->factor . 'x'; // add @2x, @3x, @1.5x, etc.
+		$new_name = $newbase . '.' . $src_extension;
+		return $new_name;
+	}
 
-    /**
-     * Performs the actual image manipulation,
-     * including saving the target file.
-     *
-     * @param  string $load_filename filepath (not URL) to source file
-     *                               (ex: /src/var/www/wp-content/uploads/my-pic.jpg)
-     * @param  string $save_filename filepath (not URL) where result file should be saved
-     *                               (ex: /src/var/www/wp-content/uploads/my-pic@2x.jpg)
-     * @return bool                  true if everything went fine, false otherwise
-     */
-    function run($load_filename, $save_filename){
-        $image = wp_get_image_editor( $load_filename );
-        if ( !is_wp_error( $image ) ) {
-            $current_size = $image->get_size();
-            $src_w = $current_size['width'];
-            $src_h = $current_size['height'];
-            // Get ratios
-            $w = $src_w * $this->factor;
-            $h = $src_h * $this->factor;
-            $image->crop( 0, 0, $src_w, $src_h, $w, $h );
-            $result = $image->save( $save_filename );
-            if ( is_wp_error( $result ) ) {
-            	// @codeCoverageIgnoreStart
+	/**
+	 * Performs the actual image manipulation,
+	 * including saving the target file.
+	 *
+	 * @param  string $load_filename filepath (not URL) to source file
+	 *                               (ex: /src/var/www/wp-content/uploads/my-pic.jpg)
+	 * @param  string $save_filename filepath (not URL) where result file should be saved
+	 *                               (ex: /src/var/www/wp-content/uploads/my-pic@2x.jpg)
+	 * @return bool                  true if everything went fine, false otherwise
+	 */
+	function run($load_filename, $save_filename){
+		$image = wp_get_image_editor( $load_filename );
+		if ( !is_wp_error( $image ) ) {
+			$current_size = $image->get_size();
+			$src_w = $current_size['width'];
+			$src_h = $current_size['height'];
+			// Get ratios
+			$w = $src_w * $this->factor;
+			$h = $src_h * $this->factor;
+			$image->crop( 0, 0, $src_w, $src_h, $w, $h );
+			$result = $image->save( $save_filename );
+			if ( is_wp_error( $result ) ) {
+				// @codeCoverageIgnoreStart
 				TimberHelper::error_log( 'Error resizing image' );
 				TimberHelper::error_log( $result );
 				return false;
 				// @codeCoverageIgnoreEnd
-            } else {
-                return true;
-            }
-        } else if ( isset( $image->error_data['error_loading_image'] ) ) {
-            TimberHelper::error_log( 'Error loading ' . $image->error_data['error_loading_image'] );
-        } else {
-            TimberHelper::error_log( $image );
-        }
-        return false;
-    }
+			} else {
+				return true;
+			}
+		} else if ( isset( $image->error_data['error_loading_image'] ) ) {
+			TimberHelper::error_log( 'Error loading ' . $image->error_data['error_loading_image'] );
+		} else {
+			TimberHelper::error_log( $image );
+		}
+		return false;
+	}
 }

lib/image/timber-image-operation.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Each image filter is represented by a subclass of this class,m
- * and each filter call is a new instance, with call arguments as properties.
- * 
- * Only 3 methods need to be implemented:
- * - constructor, storing all filter arguments
- * - filename
- * - run
- */
+	 * Each image filter is represented by a subclass of this class,m
+	 * and each filter call is a new instance, with call arguments as properties.
+	 * 
+	 * Only 3 methods need to be implemented:
+	 * - constructor, storing all filter arguments
+	 * - filename
+	 * - run
+	 */
 abstract class TimberImageOperation {
 	/**
 	 * Builds the result filename, based on source filename and extension

lib/integrations/acf-timber.php

Indentation +51 added lines, -51 removed lines

@@ -2,57 +2,57 @@
 
 class ACFTimber {
 
-    function __construct() {
-        add_filter( 'timber_post_get_meta', array( $this, 'post_get_meta' ), 10, 2 );
-        add_filter( 'timber_post_get_meta_field', array( $this, 'post_get_meta_field' ), 10, 3 );
-        add_filter( 'timber_term_get_meta', array( $this, 'term_get_meta' ), 10, 3 );
-        add_filter( 'timber_term_get_meta_field', array( $this, 'term_get_meta_field' ), 10, 4 );
-        add_filter( 'timber_user_get_meta_field_pre', array( $this, 'user_get_meta_field' ), 10, 3 );
-        add_filter( 'timber_term_set_meta', array( $this, 'term_set_meta'), 10, 4 );
-    }
-
-    function post_get_meta( $customs, $post_id ) {
-        return $customs;
-    }
-
-    function post_get_meta_field( $value, $post_id, $field_name ) {
-        return get_field( $field_name, $post_id );
-    }
-
-    function term_get_meta_field( $value, $term_id, $field_name, $term ) {
-        $searcher = $term->taxonomy . "_" . $term->ID;
-        return get_field( $field_name, $searcher );
-    }
-
-    function term_set_meta( $value, $field, $term_id, $term ) {
-        $searcher = $term->taxonomy . "_" . $term->ID;
-        update_field( $field, $value, $searcher );
-        return $value;
-    }
-
-    function term_get_meta( $fields, $term_id, $term ) {
-        $searcher = $term->taxonomy . "_" . $term->ID; // save to a specific category
-        $fds = get_fields( $searcher );
-        if ( is_array( $fds ) ) {
-            foreach ( $fds as $key => $value ) {
-                $key = preg_replace( '/_/', '', $key, 1 );
-                $key = str_replace( $searcher, '', $key );
-                $key = preg_replace( '/_/', '', $key, 1 );
-                $field = get_field( $key, $searcher );
-                $fields[$key] = $field;
-            }
-            $fields = array_merge( $fields, $fds );
-        }
-        return $fields;
-    }
-
-    function user_get_meta( $fields, $user_id ) {
-        return $fields;
-    }
-
-    function user_get_meta_field( $value, $uid, $field ) {
-        return get_field( $field, 'user_' . $uid );
-    }
+	function __construct() {
+		add_filter( 'timber_post_get_meta', array( $this, 'post_get_meta' ), 10, 2 );
+		add_filter( 'timber_post_get_meta_field', array( $this, 'post_get_meta_field' ), 10, 3 );
+		add_filter( 'timber_term_get_meta', array( $this, 'term_get_meta' ), 10, 3 );
+		add_filter( 'timber_term_get_meta_field', array( $this, 'term_get_meta_field' ), 10, 4 );
+		add_filter( 'timber_user_get_meta_field_pre', array( $this, 'user_get_meta_field' ), 10, 3 );
+		add_filter( 'timber_term_set_meta', array( $this, 'term_set_meta'), 10, 4 );
+	}
+
+	function post_get_meta( $customs, $post_id ) {
+		return $customs;
+	}
+
+	function post_get_meta_field( $value, $post_id, $field_name ) {
+		return get_field( $field_name, $post_id );
+	}
+
+	function term_get_meta_field( $value, $term_id, $field_name, $term ) {
+		$searcher = $term->taxonomy . "_" . $term->ID;
+		return get_field( $field_name, $searcher );
+	}
+
+	function term_set_meta( $value, $field, $term_id, $term ) {
+		$searcher = $term->taxonomy . "_" . $term->ID;
+		update_field( $field, $value, $searcher );
+		return $value;
+	}
+
+	function term_get_meta( $fields, $term_id, $term ) {
+		$searcher = $term->taxonomy . "_" . $term->ID; // save to a specific category
+		$fds = get_fields( $searcher );
+		if ( is_array( $fds ) ) {
+			foreach ( $fds as $key => $value ) {
+				$key = preg_replace( '/_/', '', $key, 1 );
+				$key = str_replace( $searcher, '', $key );
+				$key = preg_replace( '/_/', '', $key, 1 );
+				$field = get_field( $key, $searcher );
+				$fields[$key] = $field;
+			}
+			$fields = array_merge( $fields, $fds );
+		}
+		return $fields;
+	}
+
+	function user_get_meta( $fields, $user_id ) {
+		return $fields;
+	}
+
+	function user_get_meta_field( $value, $uid, $field ) {
+		return get_field( $field, 'user_' . $uid );
+	}
 }
 
 

lib/integrations/timber-command.php

Indentation +24 added lines, -24 removed lines

@@ -6,31 +6,31 @@
  */
 class TimberCommand {
 
-    public static function clear_cache($mode = 'all'){
-        if (is_array($mode)){
-            $mode = reset($mode);
-        }
-        if ($mode == 'all') {
-            $twig_cache = self::clear_cache_twig();
-            $timber_cache = self::clear_cache_timber();
-            if ($twig_cache && $timber_cache){
-                return true;
-            }
-        } else if ($mode == 'twig') {
-            return self::clear_cache_twig();
-        } else if ($mode == 'timber') {
-            return self::clear_cache_timber();
-        }
-    }
+	public static function clear_cache($mode = 'all'){
+		if (is_array($mode)){
+			$mode = reset($mode);
+		}
+		if ($mode == 'all') {
+			$twig_cache = self::clear_cache_twig();
+			$timber_cache = self::clear_cache_timber();
+			if ($twig_cache && $timber_cache){
+				return true;
+			}
+		} else if ($mode == 'twig') {
+			return self::clear_cache_twig();
+		} else if ($mode == 'timber') {
+			return self::clear_cache_timber();
+		}
+	}
 
-    static function clear_cache_timber(){
-        $loader = new TimberLoader();
-        return $loader->clear_cache_timber();
-    }
+	static function clear_cache_timber(){
+		$loader = new TimberLoader();
+		return $loader->clear_cache_timber();
+	}
 
-    static function clear_cache_twig(){
-        $loader = new TimberLoader();
-        return $loader->clear_cache_twig();
-    }
+	static function clear_cache_twig(){
+		$loader = new TimberLoader();
+		return $loader->clear_cache_twig();
+	}
 
 }

Braces +5 added lines, -5 removed lines

@@ -6,14 +6,14 @@ 
  */
 class TimberCommand {
 
-    public static function clear_cache($mode = 'all'){
-        if (is_array($mode)){
+    public static function clear_cache($mode = 'all') {
+        if (is_array($mode)) {
             $mode = reset($mode);
         }
         if ($mode == 'all') {
             $twig_cache = self::clear_cache_twig();
             $timber_cache = self::clear_cache_timber();
-            if ($twig_cache && $timber_cache){
+            if ($twig_cache && $timber_cache) {
                 return true;
             }
         } else if ($mode == 'twig') {
@@ -23,12 +23,12 @@ 
         }
     }
 
-    static function clear_cache_timber(){
+    static function clear_cache_timber() {
         $loader = new TimberLoader();
         return $loader->clear_cache_timber();
     }
 
-    static function clear_cache_twig(){
+    static function clear_cache_twig() {
         $loader = new TimberLoader();
         return $loader->clear_cache_twig();
     }

lib/integrations/wpcli-timber.php

Indentation +46 added lines, -46 removed lines

@@ -5,53 +5,53 @@
 
 class Timber_WP_CLI_Command extends WP_CLI_Command {
 
-    /**
-     * Clears Timber and Twig's Cache
-     *
-     * ## EXAMPLES
-     *
-     *    wp timber clear_cache
-     *
-     */
-    public function clear_cache($mode = 'all') {
-        TimberCommand::clear_cache($mode);
-    }
+	/**
+	 * Clears Timber and Twig's Cache
+	 *
+	 * ## EXAMPLES
+	 *
+	 *    wp timber clear_cache
+	 *
+	 */
+	public function clear_cache($mode = 'all') {
+		TimberCommand::clear_cache($mode);
+	}
 
-    /**
-     * Clears Twig's Cache
-     *
-     * ## EXAMPLES
-     *
-     *    wp timber clear_cache_twig
-     *
-     */
-    function clear_cache_twig(){
-        $clear = TimberCommand::clear_cache_twig();
-        if ($clear){
-            WP_CLI::success('Cleared contents of twig cache');
-        } else {
-            WP_CLI::warning('Failed to clear twig cache');
-        }
-    }
+	/**
+	 * Clears Twig's Cache
+	 *
+	 * ## EXAMPLES
+	 *
+	 *    wp timber clear_cache_twig
+	 *
+	 */
+	function clear_cache_twig(){
+		$clear = TimberCommand::clear_cache_twig();
+		if ($clear){
+			WP_CLI::success('Cleared contents of twig cache');
+		} else {
+			WP_CLI::warning('Failed to clear twig cache');
+		}
+	}
 
-    /**
-     * Clears Timber's Cache
-     *
-     * ## EXAMPLES
-     *
-     *    wp timber clear_cache_timber
-     *
-     */
-    function clear_cache_timber() {
-        $clear = TimberCommand::clear_cache_timber();
-        $message = 'Failed to clear timber cache';
-        if ($clear){
-            $message = "Cleared contents of Timber's Cache";
-            WP_CLI::success($message);
-        } else {
-            WP_CLI::warning($message);
-        }
-        return $message;
-    }
+	/**
+	 * Clears Timber's Cache
+	 *
+	 * ## EXAMPLES
+	 *
+	 *    wp timber clear_cache_timber
+	 *
+	 */
+	function clear_cache_timber() {
+		$clear = TimberCommand::clear_cache_timber();
+		$message = 'Failed to clear timber cache';
+		if ($clear){
+			$message = "Cleared contents of Timber's Cache";
+			WP_CLI::success($message);
+		} else {
+			WP_CLI::warning($message);
+		}
+		return $message;
+	}
 
 }

Braces +3 added lines, -3 removed lines

@@ -25,9 +25,9 @@ 
      *    wp timber clear_cache_twig
      *
      */
-    function clear_cache_twig(){
+    function clear_cache_twig() {
         $clear = TimberCommand::clear_cache_twig();
-        if ($clear){
+        if ($clear) {
             WP_CLI::success('Cleared contents of twig cache');
         } else {
             WP_CLI::warning('Failed to clear twig cache');
@@ -45,7 +45,7 @@ 
     function clear_cache_timber() {
         $clear = TimberCommand::clear_cache_timber();
         $message = 'Failed to clear timber cache';
-        if ($clear){
+        if ($clear) {
             $message = "Cleared contents of Timber's Cache";
             WP_CLI::success($message);
         } else {

lib/timber-admin.php

Indentation +3 added lines, -3 removed lines

@@ -2,9 +2,9 @@
 
 class TimberAdmin {
 
-    public static function init() {
-        return add_filter( 'plugin_row_meta', array( __CLASS__, 'meta_links' ), 10, 2 );
-    }
+	public static function init() {
+		return add_filter( 'plugin_row_meta', array( __CLASS__, 'meta_links' ), 10, 2 );
+	}
 
 	/**
 	 * @param array   $links

lib/timber-core.php

Indentation +103 added lines, -103 removed lines

@@ -2,116 +2,116 @@
 
 abstract class TimberCore {
 
-    public $id;
-    public $ID;
-    public $object_type;
+	public $id;
+	public $ID;
+	public $object_type;
 
-    /**
-     *
-     *
-     * @return boolean
-     */
-    function __isset( $field ) {
-        if ( isset( $this->$field ) ) {
-            return $this->$field;
-        }
-        return false;
-    }
+	/**
+	 *
+	 *
+	 * @return boolean
+	 */
+	function __isset( $field ) {
+		if ( isset( $this->$field ) ) {
+			return $this->$field;
+		}
+		return false;
+	}
 
-    /**
-     * This is helpful for twig to return properties and methods see: https://github.com/fabpot/Twig/issues/2
-     * @return mixed
-     */
-    function __call( $field, $args ) {
-        return $this->__get( $field );
-    }
+	/**
+	 * This is helpful for twig to return properties and methods see: https://github.com/fabpot/Twig/issues/2
+	 * @return mixed
+	 */
+	function __call( $field, $args ) {
+		return $this->__get( $field );
+	}
 
-    /**
-     * This is helpful for twig to return properties and methods see: https://github.com/fabpot/Twig/issues/2
-     *
-     * @return mixed
-     */
-    function __get( $field ) {
-    	if ( property_exists($this, $field) ) {
-    		return $this->$field;
-    	}
-        if ( method_exists($this, 'meta') && $meta_value = $this->meta( $field ) ) {
-            return $this->$field = $meta_value;
-        }
-        if ( method_exists($this, $field) ) {
-            return $this->$field = $this->$field();
-        }
-        return $this->$field = false;
-    }
+	/**
+	 * This is helpful for twig to return properties and methods see: https://github.com/fabpot/Twig/issues/2
+	 *
+	 * @return mixed
+	 */
+	function __get( $field ) {
+		if ( property_exists($this, $field) ) {
+			return $this->$field;
+		}
+		if ( method_exists($this, 'meta') && $meta_value = $this->meta( $field ) ) {
+			return $this->$field = $meta_value;
+		}
+		if ( method_exists($this, $field) ) {
+			return $this->$field = $this->$field();
+		}
+		return $this->$field = false;
+	}
 
-    /**
-     * Takes an array or object and adds the properties to the parent object
-     * @example
-     * ```php
-     * $data = array('airplane' => '757-200', 'flight' => '5316');
-     * $post = new TimberPost()
-     * $post->import(data);
-     * echo $post->airplane; //757-200
-     * ```
-     * @param array|object $info an object or array you want to grab data from to attach to the Timber object
-     */
-    function import( $info, $force = false ) {
-        if ( is_object( $info ) ) {
-            $info = get_object_vars( $info );
-        }
-        if ( is_array( $info ) ) {
-            foreach ( $info as $key => $value ) {
-                if ( !empty( $key ) && $force ) {
-                    $this->$key = $value;
-                } else if ( !empty( $key ) && !method_exists($this, $key) ){
-                    $this->$key = $value;
-                }
-            }
-        }
-    }
+	/**
+	 * Takes an array or object and adds the properties to the parent object
+	 * @example
+	 * ```php
+	 * $data = array('airplane' => '757-200', 'flight' => '5316');
+	 * $post = new TimberPost()
+	 * $post->import(data);
+	 * echo $post->airplane; //757-200
+	 * ```
+	 * @param array|object $info an object or array you want to grab data from to attach to the Timber object
+	 */
+	function import( $info, $force = false ) {
+		if ( is_object( $info ) ) {
+			$info = get_object_vars( $info );
+		}
+		if ( is_array( $info ) ) {
+			foreach ( $info as $key => $value ) {
+				if ( !empty( $key ) && $force ) {
+					$this->$key = $value;
+				} else if ( !empty( $key ) && !method_exists($this, $key) ){
+					$this->$key = $value;
+				}
+			}
+		}
+	}
 
 
-    /**
-     * @ignore
-     * @param string  $key
-     * @param mixed   $value
-     */
-    function update( $key, $value ) {
-        update_metadata( $this->object_type, $this->ID, $key, $value );
-    }
+	/**
+	 * @ignore
+	 * @param string  $key
+	 * @param mixed   $value
+	 */
+	function update( $key, $value ) {
+		update_metadata( $this->object_type, $this->ID, $key, $value );
+	}
 
-    /**
-     * Can you edit this post/term/user? Well good for you. You're no better than me.
-     * @example
-     * ```twig
-     * {% if post.can_edit %}
-     * <a href="{{ post.edit_link }}">Edit</a>
-     * {% endif %}
-     * ```
-     * ```html
-     * <a href="http://example.org/wp-admin/edit.php?p=242">Edit</a>
-     * ```
-     * @return bool
-     */
-    function can_edit() {
-        if ( !function_exists( 'current_user_can' ) ) {
-            return false;
-        }
-        if ( current_user_can( 'edit_post', $this->ID ) ) {
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * Can you edit this post/term/user? Well good for you. You're no better than me.
+	 * @example
+	 * ```twig
+	 * {% if post.can_edit %}
+	 * <a href="{{ post.edit_link }}">Edit</a>
+	 * {% endif %}
+	 * ```
+	 * ```html
+	 * <a href="http://example.org/wp-admin/edit.php?p=242">Edit</a>
+	 * ```
+	 * @return bool
+	 */
+	function can_edit() {
+		if ( !function_exists( 'current_user_can' ) ) {
+			return false;
+		}
+		if ( current_user_can( 'edit_post', $this->ID ) ) {
+			return true;
+		}
+		return false;
+	}
 
-    /**
-     *
-     *
-     * @return array
-     */
-    function get_method_values() {
-        $ret = array();
-        $ret['can_edit'] = $this->can_edit();
-        return $ret;
-    }
+	/**
+	 *
+	 *
+	 * @return array
+	 */
+	function get_method_values() {
+		$ret = array();
+		$ret['can_edit'] = $this->can_edit();
+		return $ret;
+	}
 
 }

Braces +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
             foreach ( $info as $key => $value ) {
                 if ( !empty( $key ) && $force ) {
                     $this->$key = $value;
-                } else if ( !empty( $key ) && !method_exists($this, $key) ){
+                } else if ( !empty( $key ) && !method_exists($this, $key) ) {
                     $this->$key = $value;
                 }
             }

lib/timber-helper.php

Braces +3 added lines, -2 removed lines

@@ -48,8 +48,9 @@
 
 			// lock timeout shouldn't be higher than 5 seconds, unless
 			// remote calls with high timeouts are made here
-			if ( $enable_transients )
-				self::_lock_transient( $slug, $lock_timeout );
+			if ( $enable_transients ) {
+							self::_lock_transient( $slug, $lock_timeout );
+			}
 
 			$data = $callback();
 

lib/timber-image-helper.php

Indentation +15 added lines, -15 removed lines

@@ -108,23 +108,23 @@
 		//its a gif so test
 		if(!($fh = @fopen($file, 'rb'))) {
 		  	return false;
-	    }
-	    $count = 0;
-	    //an animated gif contains multiple "frames", with each frame having a
-	    //header made up of:
-	    // * a static 4-byte sequence (\x00\x21\xF9\x04)
-	    // * 4 variable bytes
-	    // * a static 2-byte sequence (\x00\x2C)
+		}
+		$count = 0;
+		//an animated gif contains multiple "frames", with each frame having a
+		//header made up of:
+		// * a static 4-byte sequence (\x00\x21\xF9\x04)
+		// * 4 variable bytes
+		// * a static 2-byte sequence (\x00\x2C)
 
-	    // We read through the file til we reach the end of the file, or we've found
-	    // at least 2 frame headers
-	    while(!feof($fh) && $count < 2) {
-	        $chunk = fread($fh, 1024 * 100); //read 100kb at a time
-	        $count += preg_match_all('#\x00\x21\xF9\x04.{4}\x00[\x2C\x21]#s', $chunk, $matches);
-	    }
+		// We read through the file til we reach the end of the file, or we've found
+		// at least 2 frame headers
+		while(!feof($fh) && $count < 2) {
+			$chunk = fread($fh, 1024 * 100); //read 100kb at a time
+			$count += preg_match_all('#\x00\x21\xF9\x04.{4}\x00[\x2C\x21]#s', $chunk, $matches);
+		}
 
-	    fclose($fh);
-	    return $count > 1;
+		fclose($fh);
+		return $count > 1;
 	}
 
 	/**

Braces +2 added lines, -1 removed lines

@@ -325,7 +325,8 @@
 		);
 		$upload_dir = wp_upload_dir();
 		$tmp = $url;
-		if ( 0 === strpos($tmp, ABSPATH) ) { // we've been given a dir, not an url
+		if ( 0 === strpos($tmp, ABSPATH) ) {
+// we've been given a dir, not an url
 			$result['absolute'] = true;
 			if ( 0 === strpos($tmp, $upload_dir['basedir']) ) {
 				$result['base']= self::BASE_UPLOADS; // upload based