jarednova / timber

lib/timber-query-iterator.php

Indentation +148 added lines, -148 removed lines

@@ -1,156 +1,156 @@
 <?php
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) )
-    exit;
+	exit;
 
 class TimberQueryIterator implements Iterator {
 
-    /**
-     *
-     *
-     * @var WP_Query
-     */
-    private $_query = null;
-    private $_posts_class = 'TimberPost';
-
-    public function __construct( $query = false, $posts_class = 'TimberPost' ) {
-        add_action( 'pre_get_posts', array($this, 'fix_number_posts_wp_quirk' ));
-        if ( $posts_class )
-            $this->_posts_class = $posts_class;
-
-        if ( is_a( $query, 'WP_Query' ) ) {
-            // We got a full-fledged WP Query, look no further!
-            $the_query = $query;
-
-        } elseif ( false === $query ) {
-            // If query is explicitly set to false, use the main loop
-            global $wp_query;
-            $the_query =& $wp_query;
-            //if we're on a custom posts page?
-            $the_query = self::handle_maybe_custom_posts_page($the_query);
-        } elseif ( TimberHelper::is_array_assoc( $query ) || ( is_string( $query ) && strstr( $query, '=' ) ) ) {
-            // We have a regularly formed WP query string or array to use
-            $the_query = new WP_Query( $query );
-
-        } elseif ( is_numeric( $query ) || is_string( $query ) ) {
-            // We have what could be a post name or post ID to pull out
-            $the_query = self::get_query_from_string( $query );
-
-        } elseif ( is_array( $query ) && count( $query ) && ( is_integer( $query[0] ) || is_string( $query[0] ) ) ) {
-            // We have a list of pids (post IDs) to extract from
-            $the_query = self::get_query_from_array_of_ids( $query );
-        } elseif ( is_array($query) && empty($query)) {
-            // it's an empty array
-            $the_query = array();
-        } else {
-            TimberHelper::error_log( 'I have failed you! in ' . basename( __FILE__ ) . '::' . __LINE__ );
-            TimberHelper::error_log( $query );
-
-            // We have failed hard, at least let get something.
-            $the_query = new WP_Query();
-        }
-
-        $this->_query = $the_query;
-
-    }
-
-    public function get_posts( $return_collection = false ) {
-        if (isset($this->_query->posts)){
-            $posts = new TimberPostsCollection( $this->_query->posts, $this->_posts_class );
-            return ( $return_collection ) ? $posts : $posts->get_posts();
-        }
-    }
-
-    //
-    // GET POSTS
-    //
-    public static function get_query_from_array_of_ids( $query = array() ) {
-        if ( !is_array( $query ) || !count( $query ) )
-            return null;
-
-        return new WP_Query( array(
-                'post_type'=> 'any',
-                'ignore_sticky_posts' => true,
-                'post__in' => $query,
-                'orderby'  => 'post__in',
-                'nopaging' => true
-            ) );
-    }
-
-    public static function get_query_from_string( $string = '' ) {
-        $post_type = false;
-
-        if ( is_string( $string ) && strstr( $string, '#' ) ) {
-            //we have a post_type directive here
-            list( $post_type, $string ) = explode( '#', $string );
-        }
-
-        $query = array(
-            'post_type' => ( $post_type ) ? $post_type : 'any'
-        );
-
-        if ( is_numeric( $string ) ) {
-            $query['p'] = $string;
-
-        } else {
-            $query['name'] = $string;
-        }
-
-        return new WP_Query( $query );
-    }
-
-    //
-    // Iterator Interface
-    //
-
-    public function valid() {
-        return $this->_query->have_posts();
-    }
-
-    public function current() {
-        global $post;
-
-        $this->_query->the_post();
-
-        // Sets up the global post, but also return the post, for use in Twig template
-        $posts_class = $this->_posts_class;
-        return new $posts_class( $post );
-    }
-
-    /**
-     * Don't implement next, because current already advances the loop
-     */
-    final public function next() {}
-
-    public function rewind() {
-        $this->_query->rewind_posts();
-    }
-
-    public function key() {
-        $this->_query->current_post;
-    }
-
-    //get_posts users numberposts
-    static function fix_number_posts_wp_quirk( $query ) {
-        if (isset($query->query) && isset($query->query['numberposts'])
-                && !isset($query->query['posts_per_page'])) {
-            $query->set( 'posts_per_page', $query->query['numberposts'] );
-        }
-        return $query;
-    }
-
-    /**
-     * this will test for whether a custom page to display posts is active, and if so, set the query to the default
-     * @param  WP_Query $query the original query recived from WordPress
-     * @return WP_Query
-     */
-    static function handle_maybe_custom_posts_page( $query ) {
-    	if ($custom_posts_page = get_option('page_for_posts')) {
-        	if ( isset($query->query['p']) && $query->query['p'] == $custom_posts_page ) {
-        		return new WP_Query(array('post_type' => 'post'));
-        	}
-        }
-        return $query;
-    }
+	/**
+	 *
+	 *
+	 * @var WP_Query
+	 */
+	private $_query = null;
+	private $_posts_class = 'TimberPost';
+
+	public function __construct( $query = false, $posts_class = 'TimberPost' ) {
+		add_action( 'pre_get_posts', array($this, 'fix_number_posts_wp_quirk' ));
+		if ( $posts_class )
+			$this->_posts_class = $posts_class;
+
+		if ( is_a( $query, 'WP_Query' ) ) {
+			// We got a full-fledged WP Query, look no further!
+			$the_query = $query;
+
+		} elseif ( false === $query ) {
+			// If query is explicitly set to false, use the main loop
+			global $wp_query;
+			$the_query =& $wp_query;
+			//if we're on a custom posts page?
+			$the_query = self::handle_maybe_custom_posts_page($the_query);
+		} elseif ( TimberHelper::is_array_assoc( $query ) || ( is_string( $query ) && strstr( $query, '=' ) ) ) {
+			// We have a regularly formed WP query string or array to use
+			$the_query = new WP_Query( $query );
+
+		} elseif ( is_numeric( $query ) || is_string( $query ) ) {
+			// We have what could be a post name or post ID to pull out
+			$the_query = self::get_query_from_string( $query );
+
+		} elseif ( is_array( $query ) && count( $query ) && ( is_integer( $query[0] ) || is_string( $query[0] ) ) ) {
+			// We have a list of pids (post IDs) to extract from
+			$the_query = self::get_query_from_array_of_ids( $query );
+		} elseif ( is_array($query) && empty($query)) {
+			// it's an empty array
+			$the_query = array();
+		} else {
+			TimberHelper::error_log( 'I have failed you! in ' . basename( __FILE__ ) . '::' . __LINE__ );
+			TimberHelper::error_log( $query );
+
+			// We have failed hard, at least let get something.
+			$the_query = new WP_Query();
+		}
+
+		$this->_query = $the_query;
+
+	}
+
+	public function get_posts( $return_collection = false ) {
+		if (isset($this->_query->posts)){
+			$posts = new TimberPostsCollection( $this->_query->posts, $this->_posts_class );
+			return ( $return_collection ) ? $posts : $posts->get_posts();
+		}
+	}
+
+	//
+	// GET POSTS
+	//
+	public static function get_query_from_array_of_ids( $query = array() ) {
+		if ( !is_array( $query ) || !count( $query ) )
+			return null;
+
+		return new WP_Query( array(
+				'post_type'=> 'any',
+				'ignore_sticky_posts' => true,
+				'post__in' => $query,
+				'orderby'  => 'post__in',
+				'nopaging' => true
+			) );
+	}
+
+	public static function get_query_from_string( $string = '' ) {
+		$post_type = false;
+
+		if ( is_string( $string ) && strstr( $string, '#' ) ) {
+			//we have a post_type directive here
+			list( $post_type, $string ) = explode( '#', $string );
+		}
+
+		$query = array(
+			'post_type' => ( $post_type ) ? $post_type : 'any'
+		);
+
+		if ( is_numeric( $string ) ) {
+			$query['p'] = $string;
+
+		} else {
+			$query['name'] = $string;
+		}
+
+		return new WP_Query( $query );
+	}
+
+	//
+	// Iterator Interface
+	//
+
+	public function valid() {
+		return $this->_query->have_posts();
+	}
+
+	public function current() {
+		global $post;
+
+		$this->_query->the_post();
+
+		// Sets up the global post, but also return the post, for use in Twig template
+		$posts_class = $this->_posts_class;
+		return new $posts_class( $post );
+	}
+
+	/**
+	 * Don't implement next, because current already advances the loop
+	 */
+	final public function next() {}
+
+	public function rewind() {
+		$this->_query->rewind_posts();
+	}
+
+	public function key() {
+		$this->_query->current_post;
+	}
+
+	//get_posts users numberposts
+	static function fix_number_posts_wp_quirk( $query ) {
+		if (isset($query->query) && isset($query->query['numberposts'])
+				&& !isset($query->query['posts_per_page'])) {
+			$query->set( 'posts_per_page', $query->query['numberposts'] );
+		}
+		return $query;
+	}
+
+	/**
+	 * this will test for whether a custom page to display posts is active, and if so, set the query to the default
+	 * @param  WP_Query $query the original query recived from WordPress
+	 * @return WP_Query
+	 */
+	static function handle_maybe_custom_posts_page( $query ) {
+		if ($custom_posts_page = get_option('page_for_posts')) {
+			if ( isset($query->query['p']) && $query->query['p'] == $custom_posts_page ) {
+				return new WP_Query(array('post_type' => 'post'));
+			}
+		}
+		return $query;
+	}
 
 }

lib/timber-site.php

Indentation +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
 	/** @api
 	 * @var string for people who like trackback spam
-	*/
+	 */
 	public $pingback_url;
 	public $siteurl;
 	/**

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

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/timber-term.php

Indentation +31 added lines, -31 removed lines

@@ -1,35 +1,35 @@ 
 <?php
 /**
- * Terms: WordPress has got 'em, you want 'em. Categories. Tags. Custom Taxonomies. You don't care, you're a fiend. Well let's get this under control
- * @example
- * ```php
- * //Get a term by its ID
- * $context['term'] = new TimberTerm(6);
- * //Get a term when on a term archive page
- * $context['term_page'] = new TimberTerm();
- * //Get a term with a slug
- * $context['team'] = new TimberTerm('patriots');
- * //Get a team with a slug from a specific taxonomy
- * $context['st_louis'] = new TimberTerm('cardinals', 'baseball');
- * Timber::render('index.twig', $context);
- * ```
- * ```twig
- * <h2>{{term_page.name}} Archives</h2>
- * <h3>Teams</h3>
- * <ul>
- *     <li>{{st_louis.name}} - {{st_louis.description}}</li>
- *     <li>{{team.name}} - {{team.description}}</li>
- * </ul>
- * ```
- * ```html
- * <h2>Team Archives</h2>
- * <h3>Teams</h3>
- * <ul>
- *     <li>St. Louis Cardinals - Winner of 11 World Series</li>
- *     <li>New England Patriots - Winner of 4 Super Bowls</li>
- * </ul>
- * ```
- */
+	 * Terms: WordPress has got 'em, you want 'em. Categories. Tags. Custom Taxonomies. You don't care, you're a fiend. Well let's get this under control
+	 * @example
+	 * ```php
+	 * //Get a term by its ID
+	 * $context['term'] = new TimberTerm(6);
+	 * //Get a term when on a term archive page
+	 * $context['term_page'] = new TimberTerm();
+	 * //Get a term with a slug
+	 * $context['team'] = new TimberTerm('patriots');
+	 * //Get a team with a slug from a specific taxonomy
+	 * $context['st_louis'] = new TimberTerm('cardinals', 'baseball');
+	 * Timber::render('index.twig', $context);
+	 * ```
+	 * ```twig
+	 * <h2>{{term_page.name}} Archives</h2>
+	 * <h3>Teams</h3>
+	 * <ul>
+	 *     <li>{{st_louis.name}} - {{st_louis.description}}</li>
+	 *     <li>{{team.name}} - {{team.description}}</li>
+	 * </ul>
+	 * ```
+	 * ```html
+	 * <h2>Team Archives</h2>
+	 * <h3>Teams</h3>
+	 * <ul>
+	 *     <li>St. Louis Cardinals - Winner of 11 World Series</li>
+	 *     <li>New England Patriots - Winner of 4 Super Bowls</li>
+	 * </ul>
+	 * ```
+	 */
 class TimberTerm extends TimberCore implements TimberCoreInterface {
 
 	public $PostClass = 'TimberPost';
@@ -333,7 +333,7 @@ 
 		$suffix = '</p>';
 		$desc = term_description( $this->ID, $this->taxonomy );
 		if (substr($desc, 0, strlen($prefix)) == $prefix) {
-    		$desc = substr($desc, strlen($prefix));
+			$desc = substr($desc, strlen($prefix));
 		}
 		$desc = preg_replace('/'. preg_quote('</p>', '/') . '$/', '', $desc);
 		return trim($desc);

lib/timber-term-getter.php

Indentation +167 added lines, -167 removed lines

@@ -2,180 +2,180 @@
 
 class TimberTermGetter {
 
-    /**
-     * @param string|array $args
-     * @param array $maybe_args
-     * @param string $TermClass
-     * @return mixed
-     */
-    public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm'){
-        if (is_string($maybe_args) && !strstr($maybe_args, '=')){
-            //the user is sending the $TermClass in the second argument
-            $TermClass = $maybe_args;
-        }
-        if (is_string($maybe_args) && strstr($maybe_args, '=')){
-            parse_str($maybe_args, $maybe_args);
-        }
-        if (is_string($args) && strstr($args, '=')){
-            //a string and a query string!
-            $parsed = self::get_term_query_from_query_string($args);
-            if (is_array($maybe_args)){
-                $parsed->args = array_merge($parsed->args, $maybe_args);
-            }
-            return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-        } else if (is_string($args)){
-            //its just a string with a single taxonomy
-            $parsed = self::get_term_query_from_string($args);
-            if (is_array($maybe_args)){
-                $parsed->args = array_merge($parsed->args, $maybe_args);
-            }
-            return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-        } else if (is_array($args) && TimberHelper::is_array_assoc($args)){
-            //its an associative array, like a good ole query
-            $parsed = self::get_term_query_from_assoc_array($args);
-            return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-        } else if (is_array($args)){
-            //its just an array of strings or IDs (hopefully)
-            $parsed = self::get_term_query_from_array($args);
-            if (is_array($maybe_args)){
-                $parsed->args = array_merge($parsed->args, $maybe_args);
-            }
-            return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
-        } else if (is_null($args)) {
-            return self::handle_term_query(get_taxonomies(), array(), $TermClass);
-        }
-        return null;
-    }
+	/**
+	 * @param string|array $args
+	 * @param array $maybe_args
+	 * @param string $TermClass
+	 * @return mixed
+	 */
+	public static function get_terms($args = null, $maybe_args = array(), $TermClass = 'TimberTerm'){
+		if (is_string($maybe_args) && !strstr($maybe_args, '=')){
+			//the user is sending the $TermClass in the second argument
+			$TermClass = $maybe_args;
+		}
+		if (is_string($maybe_args) && strstr($maybe_args, '=')){
+			parse_str($maybe_args, $maybe_args);
+		}
+		if (is_string($args) && strstr($args, '=')){
+			//a string and a query string!
+			$parsed = self::get_term_query_from_query_string($args);
+			if (is_array($maybe_args)){
+				$parsed->args = array_merge($parsed->args, $maybe_args);
+			}
+			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
+		} else if (is_string($args)){
+			//its just a string with a single taxonomy
+			$parsed = self::get_term_query_from_string($args);
+			if (is_array($maybe_args)){
+				$parsed->args = array_merge($parsed->args, $maybe_args);
+			}
+			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
+		} else if (is_array($args) && TimberHelper::is_array_assoc($args)){
+			//its an associative array, like a good ole query
+			$parsed = self::get_term_query_from_assoc_array($args);
+			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
+		} else if (is_array($args)){
+			//its just an array of strings or IDs (hopefully)
+			$parsed = self::get_term_query_from_array($args);
+			if (is_array($maybe_args)){
+				$parsed->args = array_merge($parsed->args, $maybe_args);
+			}
+			return self::handle_term_query($parsed->taxonomies, $parsed->args, $TermClass);
+		} else if (is_null($args)) {
+			return self::handle_term_query(get_taxonomies(), array(), $TermClass);
+		}
+		return null;
+	}
 
-    /**
-     * @param string|array $taxonomies
-     * @param string|array $args
-     * @param string $TermClass
-     * @return mixed
-     */
-    public static function handle_term_query($taxonomies, $args, $TermClass){
-        if (!isset($args['hide_empty'])){
-            $args['hide_empty'] = false;
-        }
-        if (isset($args['term_id']) && is_int($args['term_id'])){
-            $args['term_id'] = array($args['term_id']);
-        }
-        if (isset($args['term_id'])){
-            $args['include'] = $args['term_id'];
-        }
-        $terms = get_terms($taxonomies, $args);
-        foreach($terms as &$term){
-            $term = new $TermClass($term->term_id, $term->taxonomy);
-        }
-        return $terms;
-    }
+	/**
+	 * @param string|array $taxonomies
+	 * @param string|array $args
+	 * @param string $TermClass
+	 * @return mixed
+	 */
+	public static function handle_term_query($taxonomies, $args, $TermClass){
+		if (!isset($args['hide_empty'])){
+			$args['hide_empty'] = false;
+		}
+		if (isset($args['term_id']) && is_int($args['term_id'])){
+			$args['term_id'] = array($args['term_id']);
+		}
+		if (isset($args['term_id'])){
+			$args['include'] = $args['term_id'];
+		}
+		$terms = get_terms($taxonomies, $args);
+		foreach($terms as &$term){
+			$term = new $TermClass($term->term_id, $term->taxonomy);
+		}
+		return $terms;
+	}
 
-    /**
-     * @param string $query_string
-     * @return stdClass
-     */
-    protected static function get_term_query_from_query_string($query_string) {
-        $args = array();
-        parse_str($query_string, $args);
-        $ret = self::get_term_query_from_assoc_array($args);
-        return $ret;
-    }
+	/**
+	 * @param string $query_string
+	 * @return stdClass
+	 */
+	protected static function get_term_query_from_query_string($query_string) {
+		$args = array();
+		parse_str($query_string, $args);
+		$ret = self::get_term_query_from_assoc_array($args);
+		return $ret;
+	}
 
-    /**
-     * @param string $taxs
-     * @return stdClass
-     */
-    protected static function get_term_query_from_string($taxs) {
-        $ret = new stdClass();
-        $ret->args = array();
-        if (is_string($taxs)) {
-            $taxs = array($taxs);
-        }
-        $ret->taxonomies = self::correct_taxonomy_names($taxs);
-        return $ret;
-    }
+	/**
+	 * @param string $taxs
+	 * @return stdClass
+	 */
+	protected static function get_term_query_from_string($taxs) {
+		$ret = new stdClass();
+		$ret->args = array();
+		if (is_string($taxs)) {
+			$taxs = array($taxs);
+		}
+		$ret->taxonomies = self::correct_taxonomy_names($taxs);
+		return $ret;
+	}
 
-    /**
-     * @param array $args
-     * @return stdClass
-     */
-    public static function get_term_query_from_assoc_array($args) {
-        $ret = new stdClass();
-        $ret->args = $args;
-        if (isset($ret->args['tax'])) {
-            $ret->taxonomies = $ret->args['tax'];
-        } else if (isset($ret->args['taxonomies'])) {
-            $ret->taxonomies = $ret->args['taxonomies'];
-        } else if (isset($ret->args['taxs'])) {
-            $ret->taxonomies = $ret->args['taxs'];
-        } else if (isset($ret->args['taxonomy'])) {
-            $ret->taxonomies = $ret->args['taxonomy'];
-        }
-        if (isset($ret->taxonomies)) {
-            if (is_string($ret->taxonomies)) {
-                $ret->taxonomies = array($ret->taxonomies);
-            }
-            $ret->taxonomies = self::correct_taxonomy_names($ret->taxonomies);
-        } else {
-            $ret->taxonomies = get_taxonomies();
-        }
-        return $ret;
-    }
+	/**
+	 * @param array $args
+	 * @return stdClass
+	 */
+	public static function get_term_query_from_assoc_array($args) {
+		$ret = new stdClass();
+		$ret->args = $args;
+		if (isset($ret->args['tax'])) {
+			$ret->taxonomies = $ret->args['tax'];
+		} else if (isset($ret->args['taxonomies'])) {
+			$ret->taxonomies = $ret->args['taxonomies'];
+		} else if (isset($ret->args['taxs'])) {
+			$ret->taxonomies = $ret->args['taxs'];
+		} else if (isset($ret->args['taxonomy'])) {
+			$ret->taxonomies = $ret->args['taxonomy'];
+		}
+		if (isset($ret->taxonomies)) {
+			if (is_string($ret->taxonomies)) {
+				$ret->taxonomies = array($ret->taxonomies);
+			}
+			$ret->taxonomies = self::correct_taxonomy_names($ret->taxonomies);
+		} else {
+			$ret->taxonomies = get_taxonomies();
+		}
+		return $ret;
+	}
 
-    /**
-     * @param array $args
-     * @return stdClass
-     */
-    public static function get_term_query_from_array($args) {
-        if (is_array($args) && !empty($args)) {
-            //okay its an array with content
-            if (is_int($args[0])) {
-                return self::get_term_query_from_array_of_ids($args);
-            } else if (is_string($args[0])) {
-                return self::get_term_query_from_array_of_strings($args);
-            }
-        }
-        return null;
-    }
+	/**
+	 * @param array $args
+	 * @return stdClass
+	 */
+	public static function get_term_query_from_array($args) {
+		if (is_array($args) && !empty($args)) {
+			//okay its an array with content
+			if (is_int($args[0])) {
+				return self::get_term_query_from_array_of_ids($args);
+			} else if (is_string($args[0])) {
+				return self::get_term_query_from_array_of_strings($args);
+			}
+		}
+		return null;
+	}
 
-    /**
-     * @param integer[] $args
-     * @return stdClass
-     */
-    public static function get_term_query_from_array_of_ids($args) {
-        $ret = new stdClass();
-        $ret->taxonomies = get_taxonomies();
-        $ret->args['include'] = $args;
-        return $ret;
-    }
+	/**
+	 * @param integer[] $args
+	 * @return stdClass
+	 */
+	public static function get_term_query_from_array_of_ids($args) {
+		$ret = new stdClass();
+		$ret->taxonomies = get_taxonomies();
+		$ret->args['include'] = $args;
+		return $ret;
+	}
 
-    /**
-     * @param string[] $args
-     * @return stdClass
-     */
-    public static function get_term_query_from_array_of_strings($args) {
-        $ret = new stdClass();
-        $ret->taxonomies = self::correct_taxonomy_names($args);
-        $ret->args = array();
-        return $ret;
-    }
+	/**
+	 * @param string[] $args
+	 * @return stdClass
+	 */
+	public static function get_term_query_from_array_of_strings($args) {
+		$ret = new stdClass();
+		$ret->taxonomies = self::correct_taxonomy_names($args);
+		$ret->args = array();
+		return $ret;
+	}
 
-    /**
-     * @param string|array $taxs
-     * @return array
-     */
-    private static function correct_taxonomy_names($taxs) {
-        if (is_string($taxs)) {
-            $taxs = array($taxs);
-        }
-        foreach ($taxs as &$tax) {
-            if ($tax == 'tags' || $tax == 'tag') {
-                $tax = 'post_tag';
-            } else if ($tax == 'categories') {
-                $tax = 'category';
-            }
-        }
-        return $taxs;
-    }
+	/**
+	 * @param string|array $taxs
+	 * @return array
+	 */
+	private static function correct_taxonomy_names($taxs) {
+		if (is_string($taxs)) {
+			$taxs = array($taxs);
+		}
+		foreach ($taxs as &$tax) {
+			if ($tax == 'tags' || $tax == 'tag') {
+				$tax = 'post_tag';
+			} else if ($tax == 'categories') {
+				$tax = 'category';
+			}
+		}
+		return $taxs;
+	}
 
 }