Changeset 8620 for branches/crazyhorse/wp-includes/category.php

Timestamp:

08/11/2008 10:52:43 PM (16 years ago)

Author:

ryan

Message:

crazyhorse: merge with log:trunk@8334:8619 , merge arrows unresolved

File:

• branches/crazyhorse/wp-includes/category.php (modified) (18 diffs)

branches/crazyhorse/wp-includes/category.php

@@ -15 +15 @@
  */
 function get_all_category_ids() {
-    if ( ! $cat_ids = wp_cache_get('all_category_ids', 'category') ) {
-        $cat_ids = get_terms('category', 'fields=ids&get=all');
-        wp_cache_add('all_category_ids', $cat_ids, 'category');
+    if ( ! $cat_ids = wp_cache_get( 'all_category_ids', 'category' ) ) {
+        $cat_ids = get_terms( 'category', 'fields=ids&get=all' );
+        wp_cache_add( 'all_category_ids', $cat_ids, 'category' );
     }
 
@@ -37 +37 @@
  * @return array List of categories.
  */
-function &get_categories($args = '') {
-    $defaults = array('type' => 'category');
-    $args = wp_parse_args($args, $defaults);
+function &get_categories( $args = '' ) {
+    $defaults = array( 'type' => 'category' );
+    $args = wp_parse_args( $args, $defaults );
 
     $taxonomy = 'category';
     if ( 'link' == $args['type'] )
         $taxonomy = 'link_category';
-    $categories = get_terms($taxonomy, $args);
-
-    foreach ( array_keys($categories) as $k )
-        _make_cat_compat($categories[$k]);
+    $categories = (array) get_terms( $taxonomy, $args );
+
+    foreach ( array_keys( $categories ) as $k )
+        _make_cat_compat( $categories[$k] );
 
     return $categories;
@@ -74 +74 @@
  * @return mixed Category data in type defined by $output parameter.
  */
-function &get_category($category, $output = OBJECT, $filter = 'raw') {
-    $category = get_term($category, 'category', $output, $filter);
+function &get_category( $category, $output = OBJECT, $filter = 'raw' ) {
+    $category = get_term( $category, 'category', $output, $filter );
     if ( is_wp_error( $category ) )
         return $category;
 
-    _make_cat_compat($category);
+    _make_cat_compat( $category );
 
     return $category;
@@ -103 +103 @@
  * @return null|object|array Null on failure. Type is based on $output value.
  */
-function get_category_by_path($category_path, $full_match = true, $output = OBJECT) {
-    $category_path = rawurlencode(urldecode($category_path));
-    $category_path = str_replace('%2F', '/', $category_path);
-    $category_path = str_replace('%20', ' ', $category_path);
-    $category_paths = '/' . trim($category_path, '/');
-    $leaf_path  = sanitize_title(basename($category_paths));
-    $category_paths = explode('/', $category_paths);
+function get_category_by_path( $category_path, $full_match = true, $output = OBJECT ) {
+    $category_path = rawurlencode( urldecode( $category_path ) );
+    $category_path = str_replace( '%2F', '/', $category_path );
+    $category_path = str_replace( '%20', ' ', $category_path );
+    $category_paths = '/' . trim( $category_path, '/' );
+    $leaf_path  = sanitize_title( basename( $category_paths ) );
+    $category_paths = explode( '/', $category_paths );
     $full_path = '';
     foreach ( (array) $category_paths as $pathdir )
-        $full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title($pathdir);
-
-    $categories = get_terms('category', "get=all&slug=$leaf_path");
-
-    if ( empty($categories) )
+        $full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title( $pathdir );
+
+    $categories = get_terms( 'category', "get=all&slug=$leaf_path" );
+
+    if ( empty( $categories ) )
         return null;
 
-    foreach ($categories as $category) {
+    foreach ( $categories as $category ) {
         $path = '/' . $leaf_path;
         $curcategory = $category;
-        while ( ($curcategory->parent != 0) && ($curcategory->parent != $curcategory->term_id) ) {
-            $curcategory = get_term($curcategory->parent, 'category');
+        while ( ( $curcategory->parent != 0 ) && ( $curcategory->parent != $curcategory->term_id ) ) {
+            $curcategory = get_term( $curcategory->parent, 'category' );
             if ( is_wp_error( $curcategory ) )
                 return $curcategory;
@@ -130 +130 @@
 
         if ( $path == $full_path )
-            return get_category($category->term_id, $output);
+            return get_category( $category->term_id, $output );
     }
 
     // If full matching is not required, return the first cat that matches the leaf.
     if ( ! $full_match )
-        return get_category($categories[0]->term_id, $output);
+        return get_category( $categories[0]->term_id, $output );
 
     return null;
@@ -149 +149 @@
  */
 function get_category_by_slug( $slug  ) {
-    $category = get_term_by('slug', $slug, 'category');
+    $category = get_term_by( 'slug', $slug, 'category' );
     if ( $category )
-        _make_cat_compat($category);
+        _make_cat_compat( $category );
 
     return $category;
@@ -165 +165 @@
  * @return int 0, if failure and ID of category on success.
  */
-function get_cat_ID($cat_name='General') {
-    $cat = get_term_by('name', $cat_name, 'category');
-    if ($cat)
+function get_cat_ID( $cat_name='General' ) {
+    $cat = get_term_by( 'name', $cat_name, 'category' );
+    if ( $cat )
         return $cat->term_id;
     return 0;
@@ -183 +183 @@
  * @return string category name
  */
-function get_catname($cat_ID) {
-    return get_cat_name($cat_ID);
+function get_catname( $cat_ID ) {
+    return get_cat_name( $cat_ID );
 }
 
@@ -196 +196 @@
  * @return string Category name
  */
-function get_cat_name($cat_id) {
+function get_cat_name( $cat_id ) {
     $cat_id = (int) $cat_id;
-    $category = &get_category($cat_id);
+    $category = &get_category( $cat_id );
     return $category->name;
 }
@@ -215 +215 @@
  * @return bool Whether $cat2 is child of $cat1
  */
-function cat_is_ancestor_of($cat1, $cat2) {
-    if ( is_int($cat1) )
-        $cat1 = & get_category($cat1);
-    if ( is_int($cat2) )
-        $cat2 = & get_category($cat2);
+function cat_is_ancestor_of( $cat1, $cat2 ) {
+    if ( is_int( $cat1 ) )
+        $cat1 = &get_category( $cat1 );
+    if ( is_int( $cat2 ) )
+        $cat2 = &get_category( $cat2 );
 
     if ( !$cat1->term_id || !$cat2->parent )
@@ -227 +227 @@
         return true;
 
-    return cat_is_ancestor_of($cat1, get_category($cat2->parent));
+    return cat_is_ancestor_of( $cat1, get_category( $cat2->parent ) );
 }
 
@@ -241 +241 @@
  * @return object|array Same type as $category with sanitized data for safe use.
  */
-function sanitize_category($category, $context = 'display') {
-    return sanitize_term($category, 'category', $context);
+function sanitize_category( $category, $context = 'display' ) {
+    return sanitize_term( $category, 'category', $context );
 }
 
@@ -258 +258 @@
  * @return mixed Same type as $value after $value has been sanitized.
  */
-function sanitize_category_field($field, $value, $cat_id, $context) {
-    return sanitize_term_field($field, $value, $cat_id, 'category', $context);
+function sanitize_category_field( $field, $value, $cat_id, $context ) {
+    return sanitize_term_field( $field, $value, $cat_id, 'category', $context );
 }
 
@@ -275 +275 @@
  * @return array List of tags.
  */
-function &get_tags($args = '') {
-    $tags = get_terms('post_tag', $args);
-
-    if ( empty($tags) )
+function &get_tags( $args = '' ) {
+    $tags = get_terms( 'post_tag', $args );
+
+    if ( empty( $tags ) )
         return array();
 
-    $tags = apply_filters('get_tags', $tags, $args);
+    $tags = apply_filters( 'get_tags', $tags, $args );
     return $tags;
 }
@@ -305 +305 @@
  * @return object|array Return type based on $output value.
  */
-function &get_tag($tag, $output = OBJECT, $filter = 'raw') {
-    return get_term($tag, 'post_tag', $output, $filter);
+function &get_tag( $tag, $output = OBJECT, $filter = 'raw' ) {
+    return get_term( $tag, 'post_tag', $output, $filter );
 }
 
@@ -337 +337 @@
  * @param int $id Category ID
  */
-function clean_category_cache($id) {
-    clean_term_cache($id, 'category');
+function clean_category_cache( $id ) {
+    clean_term_cache( $id, 'category' );
 }
 
@@ -361 +361 @@
  * @param array|object $category Category Row object or array
  */
-function _make_cat_compat( &$category) {
-    if ( is_object($category) ) {
+function _make_cat_compat( &$category ) {
+    if ( is_object( $category ) ) {
         $category->cat_ID = &$category->term_id;
         $category->category_count = &$category->count;
@@ -369 +369 @@
         $category->category_nicename = &$category->slug;
         $category->category_parent = &$category->parent;
-    } else if ( is_array($category) && isset($category['term_id']) ) {
+    } elseif ( is_array( $category ) && isset( $category['term_id'] ) ) {
         $category['cat_ID'] = &$category['term_id'];
         $category['category_count'] = &$category['count'];