WordPress.org

Plugin Directory

Changeset 752123


Ignore:
Timestamp:
08/06/13 07:13:51 (9 months ago)
Author:
mfields
Message:

Taxonomy Images: Version 0.8.0

  • Pass an empty array as default second parameter of taxonomy_images_plugin_get_the_terms() and taxonomy_images_plugin_list_the_terms().
  • Use jQuery.on() instead of jQuery.live(). Props [jamiemchale](http://profiles.wordpress.org/jamiemchale).
  • Give the button on the custom admin screen a class of button-primary.
  • Store the return value of get_posts() in a variable called $images. Not sure why, but this should not harm anything.
  • Change license to GPLv2 or later for maximum flexibility and compatibility.
  • Add jamiemchale as a contributor.
  • Random whitespace fixes.
  • Update Documentation.
  • CSS coding standards.
  • Bump version number.
  • Update Readmes.
Location:
taxonomy-images/trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • taxonomy-images/trunk/admin.css

    r391118 r752123  
    11.taxonomy-images-modal .create-association .term-name { 
    2     font-style:italic; 
     2    font-style: italic; 
    33} 
    44.taxonomy-images-modal .create-association { 
    5     display:inline; 
     5    display: inline; 
    66} 
    77.taxonomy-images-modal .remove-association { 
    8     display:none; 
    9     color:#bc0b0b; 
    10     text-decoration:underline; 
    11     cursor:pointer; 
     8    color: #bc0b0b; 
     9    cursor: pointer; 
     10    display: none; 
     11    text-decoration: underline; 
    1212} 
    1313.taxonomy-images-modal #tab-type_url, 
    1414.taxonomy-images-modal .savesend input { 
    15     display:none !important; 
     15    display: none !important; 
    1616} 
    1717.taxonomy-image-thumbnail { 
    18     display:block; 
    19     height:77px; 
    20     width:77px; 
    21     overflow:hidden; 
    22     text-align:center; 
    23     margin-bottom:3px; 
     18    display: block; 
     19    margin-bottom: 3px; 
     20    overflow: hidden; 
     21    text-align: center; 
     22    width: 77px; 
     23    height: 77px; 
    2424} 
    2525.taxonomy-image-control .control { 
    26     display:block; 
    27     float:left; 
    28     text-indent:-9999em; 
    29     width:15px; 
    30     height:15px; 
    31     background:url( controls.png ); 
    32     background-repeat:no-repeat; 
     26    background: url( controls.png ); 
     27    background-repeat: no-repeat; 
     28    display: block; 
     29    float: left; 
     30    text-indent: -9999em; 
     31    width: 15px; 
     32    height: 15px; 
    3333} 
    34 .taxonomy-image-control .control:hover { cursor:pointer; } 
    35 .taxonomy-image-control .upload { background-position: 0 0; } 
    36 .taxonomy-image-control .upload:hover { background-position: -15px 0 } 
    37 .taxonomy-image-control .remove { background-position:-30px 0; } 
    38 .taxonomy-image-control .remove:hover { background-position:-45px 0; } 
    39 .taxonomy-image-control .library { background-position: -60px 0; } 
    40 .taxonomy-image-control .hide { visibility:hidden; } 
    41 .taxonomy-image-control .show { visibility:visible; } 
     34.taxonomy-image-control .control:hover { 
     35    cursor: pointer; 
     36} 
     37.taxonomy-image-control .upload { 
     38    background-position: 0 0; 
     39} 
     40.taxonomy-image-control .upload:hover { 
     41    background-position: -15px 0; 
     42} 
     43.taxonomy-image-control .remove { 
     44    background-position: -30px 0; 
     45} 
     46.taxonomy-image-control .remove:hover { 
     47    background-position: -45px 0; 
     48} 
     49.taxonomy-image-control .library { 
     50    background-position: -60px 0; 
     51} 
     52.taxonomy-image-control .hide { 
     53    visibility: hidden; 
     54} 
     55.taxonomy-image-control .show { 
     56    visibility: visible; 
     57} 
  • taxonomy-images/trunk/deprecated.php

    r391118 r752123  
    2525    $terms = get_terms( $taxonomy ); 
    2626    $associations = taxonomy_image_plugin_get_associations( $refresh = false ); 
    27      
     27 
    2828    if ( ! is_wp_error( $terms ) ) { 
    2929        foreach( (array) $terms as $term ) { 
     
    3232            $title_attr  = esc_attr( $term->name . ' (' . $term->count . ')' ); 
    3333            $description = apply_filters( 'the_content', $term->description ); 
    34              
     34 
    3535            $img = ''; 
    3636            if ( array_key_exists( $term->term_taxonomy_id, $associations ) ) { 
    3737                $img = wp_get_attachment_image( $associations[$term->term_taxonomy_id], 'detail', false ); 
    3838            } 
    39              
     39 
    4040            if( $template === 'grid' ) { 
    4141                $o.= "\n\t" . '<div class="taxonomy_image_plugin-' . $template . '">'; 
  • taxonomy-images/trunk/edit-tags.js

    r399254 r752123  
    11jQuery( document ).ready( function( $ ) { 
    22 
    3     $( '.taxonomy-image-control a' ).live( 'click', function () { 
     3    $( 'body' ).on( 'click', '.taxonomy-image-control a', function () { 
    44        taxonomyImagesPlugin.tt_id = parseInt( $( this ).parent().find( 'input.tt_id' ).val() ); 
    55        taxonomyImagesPlugin.term_name = $( this ).parent().find( 'input.term_name' ).val(); 
     
    77    } ); 
    88 
    9     $( '.taxonomy-image-control .remove' ).live( 'click', function () { 
     9    $( 'body' ).on( 'click', '.taxonomy-image-control .remove', function () { 
    1010        $.ajax( { 
    1111            url: ajaxurl, 
  • taxonomy-images/trunk/media-upload-popup.js

    r391118 r752123  
    4040    } 
    4141 
    42     $( '.taxonomy-images-modal .remove-association' ).live( 'click', function () { 
     42    $( '.taxonomy-images-modal' ).on( 'click', '.remove-association', function () { 
    4343        var button = $( this ); 
    4444        originalText = button.html(); 
     
    7373    } ); 
    7474 
    75     $( '.taxonomy-images-modal .create-association' ).live( 'click', function () { 
     75    $( '.taxonomy-images-modal' ).on( 'click', '.create-association', function () { 
    7676        var button, selector, originalText; 
    7777        if ( 0 == ID ) { 
  • taxonomy-images/trunk/public-filters.php

    r399221 r752123  
    88 * use of functions defined herein constitutes unsupported use 
    99 * and is strongly discouraged. This file contains custom filters 
    10  * have been added which enable extension authors to interact with 
    11  * this plugin in a responsible manner. 
     10 * which enable extension authors to interact with this plugin in 
     11 * a responsible manner. 
    1212 * 
    1313 * @package      Taxonomy Images 
     
    4141 * integer with the value of zero. 
    4242 * 
     43 * @see http://codex.wordpress.org/Function_Reference/get_terms 
     44 * 
    4345 * Recognized Arguments: 
    4446 * 
    45  * cache_images (bool) A non-empty value will trigger 
    46  * this function to query for and cache all associated 
    47  * images. An empty value disables caching. Defaults to 
    48  * boolean true. 
    49  * 
    50  * having_images (bool) A non-empty value will trigger 
    51  * this function to only return terms that have associated 
    52  * images. If an empty value is passed all terms of the  
    53  * taxonomy will be returned. 
     47 * cache_images (bool) If true, all images will be added to 
     48 * WordPress object cache. If false, caching will not occur. 
     49 * Defaults to true. Optional. 
     50 * 
     51 * having_images (bool) If true, the returned array will contain 
     52 * only terms that have associated images. If false, all terms 
     53 * of the taxonomy will be returned. Defaults to true. Optional. 
    5454 * 
    5555 * taxonomy (string) Name of a registered taxonomy to 
    56  * return terms from. Defaults to "category". 
     56 * return terms from. Defaults to "category". Optional. 
    5757 * 
    5858 * term_args (array) Arguments to pass as the second 
    5959 * parameter of get_terms(). Defaults to an empty array. 
     60 * Optional. 
    6061 * 
    6162 * @param     mixed     Default value for apply_filters() to return. Unused. 
     
    137138 * integer with the value of zero. 
    138139 * 
     140 * @see http://codex.wordpress.org/Function_Reference/get_the_terms 
     141 * 
    139142 * Recognized Arguments: 
    140143 * 
    141  * having_images (bool) A non-empty value will trigger 
    142  * this function to only return terms that have associated 
    143  * images. If an empty value is passed all terms of the 
    144  * taxonomy will be returned. Optional. 
     144 * having_images (bool) If true, the returned array will contain 
     145 * only terms that have associated images. If false, all terms 
     146 * of the taxonomy will be returned. Defaults to true. Optional. 
    145147 * 
    146148 * post_id (int) The post to retrieve terms from. Defaults 
     
    157159 * @since     0.7 
    158160 */ 
    159 function taxonomy_images_plugin_get_the_terms( $default, $args ) { 
     161function taxonomy_images_plugin_get_the_terms( $default, $args = array() ) { 
    160162    $filter = 'taxonomy-images-get-the-terms'; 
    161163    if ( $filter !== current_filter() ) { 
     
    215217 * Recognized Arguments: 
    216218 * 
    217  * after (string) Text to append to the output. Optional. 
    218  * Defaults to an empty string. 
    219  * 
    220  * before (string) Text to preppend to the output. Optional. 
    221  * Defaults to an empty string. 
     219 * after (string) Text to append to the output. 
     220 * Defaults to: '</ul>'. Optional. 
     221 * 
     222 * after_image (string) Text to append to each image in the 
     223 * list. Defaults to: '</li>'. Optional. 
     224 * 
     225 * before (string) Text to preppend to the output. 
     226 * Defaults to: '<ul class="taxonomy-images-the-terms">'. 
     227 * Optional. 
     228 * 
     229 * before_image (string) Text to prepend to each image in the 
     230 * list. Defaults to: '<li>'. Optional. 
    222231 * 
    223232 * image_size (string) Any registered image size. Values will 
    224233 * vary from installation to installation. Image sizes defined 
    225  * in core include: "thumbnail", "medium" and "large". "Fullsize" 
    226  * may also be used to get the un modified image that was uploaded. 
     234 * in core include: "thumbnail", "medium" and "large". "fullsize" 
     235 * may also be used to get the unmodified image that was uploaded. 
    227236 * Optional. Defaults to "thumbnail". 
    228237 * 
     
    240249 * @since     0.7 
    241250 */ 
    242 function taxonomy_images_plugin_list_the_terms( $default, $args ) { 
     251function taxonomy_images_plugin_list_the_terms( $default, $args = array() ) { 
    243252    $filter = 'taxonomy-images-list-the-terms'; 
    244253    if ( $filter !== current_filter() ) { 
     
    289298 * Queried Term Image. 
    290299 * 
    291  * Prints html marking up the images associated with 
     300 * Prints html markup for the image associated with 
    292301 * the current queried term. 
    293302 * 
  • taxonomy-images/trunk/readme.md

    r399305 r752123  
    9494 
    9595* __image_size__ (string) - Any registered image size. Values will vary from installation to installation. Image sizes defined in core include: "thumbnail", "medium" and "large". "Fullsize" may also be used to get the unmodified image that was uploaded. Defaults to "thumbnail". 
    96   
     96 
    9797* __post_id__ (int) - The post to retrieve terms from. Defaults to the ID property of the global $post object. 
    98   
     98 
    9999* __taxonomy__ (string) - Name of a registered taxonomy to return terms from. Defaults to "category". 
    100100 
     
    208208--------- 
    209209 
     210__0.8.0__ 
     211 
     212* Pass an empty array as default second parameter of `taxonomy_images_plugin_get_the_terms()` and `taxonomy_images_plugin_list_the_terms()`. 
     213* Use jQuery.on() instead of jQuery.live(). Props [jamiemchale](http://profiles.wordpress.org/jamiemchale). 
     214* Give the button on the custom admin screen a class of `button-primary`. 
     215* Store the return value of `get_posts()` in a variable called `$images`. Not sure why, but this should not harm anything. 
     216* Change license to GPLv2 or later for maximum flexibility and compatibility. 
     217* Add jamiemchale as a contributor. 
     218* Random whitespace fixes. 
     219* Update Documentation. 
     220* CSS coding standards. 
     221* Bump version number. 
     222* Update Readmes. 
     223 
    210224__0.7.3__ 
    211225 
  • taxonomy-images/trunk/readme.txt

    r399305 r752123  
    11===Taxonomy Images=== 
    22 
    3 Contributors:         mfields 
     3Contributors:         mfields, jamiemchale 
    44Donate link:          http://wordpress.mfields.org/donate/ 
    55Tags:                 taxonomy, tag, category, image, upload, media 
    66Requires at least:    3.1 
    7 Tested up to:         3.2-beta2-18055 
     7Tested up to:         3.6 
    88Stable tag:           trunk 
    99 
     
    100100 
    101101* __image_size__ (string) - Any registered image size. Values will vary from installation to installation. Image sizes defined in core include: "thumbnail", "medium" and "large". "Fullsize" may also be used to get the unmodified image that was uploaded. Defaults to "thumbnail". 
    102   
     102 
    103103* __post_id__ (int) - The post to retrieve terms from. Defaults to the ID property of the global $post object. 
    104   
     104 
    105105* __taxonomy__ (string) - Name of a registered taxonomy to return terms from. Defaults to "category". 
    106106 
     
    206206== Upgrade Notice == 
    207207 
     208= 0.8 = 
     209Major and minor bug fixes tested with WordPres 3.6 
     210 
    208211= 0.7 = 
    209 Complete rewrite. Better everything. Many bug fixes.  
     212Complete rewrite. Better everything. Many bug fixes. 
    210213 
    211214==Changelog== 
     215 
     216= 0.8.0 = 
     217* Pass an empty array as default second parameter of `taxonomy_images_plugin_get_the_terms()` and `taxonomy_images_plugin_list_the_terms()`. 
     218* Use jQuery.on() instead of jQuery.live(). Props [jamiemchale](http://profiles.wordpress.org/jamiemchale). 
     219* Give the button on the custom admin screen a class of `button-primary`. 
     220* Store the return value of `get_posts()` in a variable called `$images`. Not sure why, but this should not harm anything. 
     221* Change license to GPLv2 or later for maximum flexibility and compatibility. 
     222* Add jamiemchale as a contributor. 
     223* Random whitespace fixes. 
     224* Update Documentation. 
     225* CSS coding standards. 
     226* Bump version number. 
     227* Update Readmes. 
    212228 
    213229= 0.7.3 = 
  • taxonomy-images/trunk/style.css

    r391118 r752123  
    11.taxonomy-images-the-terms { 
    2     margin:10px 0; 
    3     padding:0; 
    4     zoom:1; 
     2    margin: 10px 0; 
     3    padding: 0; 
     4    zoom: 1; 
    55} 
    66.taxonomy-images-the-terms:before, 
    77.taxonomy-images-the-terms:after { 
    8     content:"\0020"; 
    9     display:block; 
    10     height:0; 
    11     visibility:hidden; 
    12     clear:both; 
     8    clear: both; 
     9    content: "\0020"; 
     10    display: block; 
     11    height: 0; 
     12    visibility: hidden; 
    1313} 
    1414.taxonomy-images-the-terms li, 
  • taxonomy-images/trunk/taxonomy-images.php

    r399305 r752123  
    44Plugin URI:           http://wordpress.mfields.org/plugins/taxonomy-images/ 
    55Description:          Associate images from your media library to categories, tags and custom taxonomies. 
    6 Version:              0.7.3 
     6Version:              0.8.0 
    77Author:               Michael Fields 
    88Author URI:           http://wordpress.mfields.org/ 
    9 License:              GPLv2 
     9License:              GNU General Public License v2 or later 
     10License URI:          http://www.gnu.org/licenses/gpl-2.0.html 
    1011 
    1112Copyright 2010-2011  Michael Fields  michael@mfields.org 
     
    3637 * @access    private 
    3738 * @since     0.7 
    38  * @alter     0.7.3 
     39 * @alter     0.7.4 
    3940 */ 
    4041function taxonomy_image_plugin_version() { 
    41     return '0.7.3'; 
     42    return '0.8.0'; 
    4243} 
    4344 
     
    7071        'name' => 'detail', 
    7172        'size' => array( 75, 75, true ) 
    72         ); 
     73    ); 
    7374} 
    7475 
     
    8788        $detail['size'][1], 
    8889        $detail['size'][2] 
    89         ); 
     90    ); 
    9091} 
    9192add_action( 'init', 'taxonomy_image_plugin_add_image_size' ); 
     
    161162    /* Return url to custom intermediate size if it exists. */ 
    162163    $img = image_get_intermediate_size( $id, $detail['name'] ); 
    163     if ( isset( $img['url'] ) ) { 
     164    if ( isset( $img['url'] ) ) 
    164165        return $img['url']; 
    165     } 
    166166 
    167167    /* Detail image does not exist, attempt to create it. */ 
     
    194194    /* Custom intermediate size cannot be created, try for thumbnail. */ 
    195195    $img = image_get_intermediate_size( $id, 'thumbnail' ); 
    196     if ( isset( $img['url'] ) ) { 
     196    if ( isset( $img['url'] ) ) 
    197197        return $img['url']; 
    198     } 
    199198 
    200199    /* Thumbnail cannot be found, try fullsize. */ 
    201200    $url = wp_get_attachment_url( $id ); 
    202     if ( ! empty( $url ) ) { 
     201    if ( ! empty( $url ) ) 
    203202        return $url; 
    204     } 
    205203 
    206204    /* 
     
    246244        $tt_id = absint( $tt_id ); 
    247245        $im_id = absint( $im_id ); 
    248         if ( 0 < $tt_id && 0 < $im_id ) { 
     246        if ( 0 < $tt_id && 0 < $im_id ) 
    249247            $o[$tt_id] = $im_id; 
    250         } 
    251248    } 
    252249    return $o; 
     
    272269        $taxonomies = get_taxonomies(); 
    273270        foreach ( (array) $dirty['taxonomies'] as $taxonomy ) { 
    274             if ( in_array( $taxonomy, $taxonomies ) ) { 
     271            if ( in_array( $taxonomy, $taxonomies ) ) 
    275272                $clean['taxonomies'][] = $taxonomy; 
    276             } 
    277273        } 
    278274    } 
     
    314310        'taxonomy_image_plugin', 
    315311        'taxonomy_image_plugin_sanitize_associations' 
    316         ); 
     312    ); 
    317313    register_setting( 
    318314        'taxonomy_image_plugin_settings', 
    319315        'taxonomy_image_plugin_settings', 
    320316        'taxonomy_image_plugin_settings_sanitize' 
    321         ); 
     317    ); 
    322318    add_settings_section( 
    323319        'taxonomy_image_plugin_settings', 
     
    325321        '__return_false', 
    326322        'taxonomy_image_plugin_settings' 
    327         ); 
     323    ); 
    328324    add_settings_field( 
    329325        'taxonomy-images', 
     
    332328        'taxonomy_image_plugin_settings', 
    333329        'taxonomy_image_plugin_settings' 
    334         ); 
     330    ); 
    335331} 
    336332add_action( 'admin_init', 'taxonomy_image_plugin_register_settings' ); 
     
    352348        'taxonomy_image_plugin_settings', 
    353349        'taxonomy_image_plugin_settings_page' 
    354         ); 
     350    ); 
    355351} 
    356352add_action( 'admin_menu', 'taxonomy_images_settings_menu' ); 
     
    383379 
    384380    /* translators: Button on the custom administration page. */ 
    385     print "\n" . '<div class="button-holder"><input name="submit" type="submit" value="' . esc_attr__( 'Save Changes', 'taxonomy-images' ) . '" /></div>'; 
     381    print "\n" . '<div class="button-holder"><input class="button-primary" name="submit" type="submit" value="' . esc_attr__( 'Save Changes', 'taxonomy-images' ) . '" /></div>'; 
    386382    print "\n" . '</div></form></div>'; 
    387383} 
     
    397393    $taxonomies = get_taxonomies( array(), 'objects' ); 
    398394    foreach ( (array) $taxonomies as $taxonomy ) { 
    399         if ( ! isset( $taxonomy->name ) ) { 
     395        if ( ! isset( $taxonomy->name ) ) 
    400396            continue; 
    401         } 
    402         if ( ! isset( $taxonomy->label ) ) { 
     397 
     398        if ( ! isset( $taxonomy->label ) ) 
    403399            continue; 
    404         } 
    405         if ( ! isset( $taxonomy->show_ui ) || empty( $taxonomy->show_ui ) ) { 
     400 
     401        if ( ! isset( $taxonomy->show_ui ) || empty( $taxonomy->show_ui ) ) 
    406402            continue; 
    407         } 
     403 
    408404        $id = 'taxonomy-images-' . $taxonomy->name; 
     405 
    409406        $checked = ''; 
    410         if ( isset( $settings['taxonomies'] ) && in_array( $taxonomy->name, (array) $settings['taxonomies'] ) ) { 
     407        if ( isset( $settings['taxonomies'] ) && in_array( $taxonomy->name, (array) $settings['taxonomies'] ) ) 
    411408            $checked = ' checked="checked"'; 
    412         } 
     409 
    413410        print "\n" . '<p><label for="' . esc_attr( $id ) . '">'; 
    414411        print '<input' . $checked . ' id="' . esc_attr( $id ) . '" type="checkbox" name="taxonomy_image_plugin_settings[taxonomies][]" value="' . esc_attr( $taxonomy->name ) . '">'; 
     
    453450        return $cache[$tt_id]; 
    454451    } 
     452 
    455453    global $wpdb; 
     454 
    456455    $data = $wpdb->get_results( $wpdb->prepare( "SELECT term_id, taxonomy FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d LIMIT 1", $tt_id ) ); 
    457     if ( isset( $data[0]->term_id ) ) { 
     456    if ( isset( $data[0]->term_id ) ) 
    458457        $cache[$tt_id]['term_id'] = absint( $data[0]->term_id ); 
    459     } 
    460     if ( isset( $data[0]->taxonomy ) ) { 
     458 
     459    if ( isset( $data[0]->taxonomy ) ) 
    461460        $cache[$tt_id]['taxonomy'] = sanitize_title_with_dashes( $data[0]->taxonomy ); 
    462     } 
    463     if ( isset( $cache[$tt_id] ) ) { 
     461 
     462    if ( isset( $cache[$tt_id] ) ) 
    464463        return $cache[$tt_id]; 
    465     } 
     464 
    466465    return array(); 
    467466} 
     
    481480function taxonomy_image_plugin_check_permissions( $tt_id ) { 
    482481    $data = taxonomy_image_plugin_get_term_info( $tt_id ); 
    483     if ( ! isset( $data['taxonomy'] ) ) { 
     482    if ( ! isset( $data['taxonomy'] ) ) 
    484483        return false; 
    485     } 
    486484 
    487485    $taxonomy = get_taxonomy( $data['taxonomy'] ); 
    488     if ( ! isset( $taxonomy->cap->edit_terms ) ) { 
     486    if ( ! isset( $taxonomy->cap->edit_terms ) ) 
    489487        return false; 
    490     } 
    491488 
    492489    return current_user_can( $taxonomy->cap->edit_terms ); 
     
    660657function taxonomy_image_plugin_get_associations( $refresh = false ) { 
    661658    static $associations = array(); 
    662     if ( empty( $associations ) || $refresh ) { 
     659    if ( empty( $associations ) || $refresh ) 
    663660        $associations = taxonomy_image_plugin_sanitize_associations( get_option( 'taxonomy_image_plugin' ) ); 
    664     } 
     661 
    665662    return $associations; 
    666663} 
     
    681678function taxonomy_image_plugin_add_dynamic_hooks() { 
    682679    $settings = get_option( 'taxonomy_image_plugin_settings' ); 
    683     if ( ! isset( $settings['taxonomies'] ) ) { 
     680    if ( ! isset( $settings['taxonomies'] ) ) 
    684681        return; 
    685     } 
     682 
    686683    foreach ( $settings['taxonomies'] as $taxonomy ) { 
    687684        add_filter( 'manage_' . $taxonomy . '_custom_column', 'taxonomy_image_plugin_taxonomy_rows', 15, 3 ); 
     
    753750    $taxonomy = get_taxonomy( $taxonomy ); 
    754751    $name = __( 'term', 'taxonomy-images' ); 
    755     if ( isset( $taxonomy->labels->singular_name ) ) { 
     752    if ( isset( $taxonomy->labels->singular_name ) ) 
    756753        $name = strtolower( $taxonomy->labels->singular_name ); 
    757     } 
    758754    ?> 
    759755    <tr class="form-field hide-if-no-js"> 
     
    782778 
    783779    $tt_id = 0; 
    784     if ( isset( $term->term_taxonomy_id ) ) { 
     780    if ( isset( $term->term_taxonomy_id ) ) 
    785781        $tt_id = (int) $term->term_taxonomy_id; 
    786     } 
    787782 
    788783    $taxonomy = get_taxonomy( $taxonomy ); 
    789784 
    790785    $name = esc_html__( 'term', 'taxonomy-images' ); 
    791     if ( isset( $taxonomy->labels->singular_name ) ) { 
     786    if ( isset( $taxonomy->labels->singular_name ) ) 
    792787        $name = strtolower( $taxonomy->labels->singular_name ); 
    793     } 
    794788 
    795789    $hide = ' hide'; 
     
    813807    $o.= "\n" . '<input type="hidden" class="image_id" name="' . esc_attr( 'image_id-' . $tt_id ) . '" value="' . esc_attr( $attachment_id ) . '" />'; 
    814808 
    815     if ( isset( $term->name ) && isset( $term->slug ) ) { 
     809    if ( isset( $term->name ) && isset( $term->slug ) ) 
    816810        $o.= "\n" . '<input type="hidden" class="term_name" name="' . esc_attr( 'term_name-' . $term->slug ) . '" value="' . esc_attr( $term->name ) . '" />'; 
    817     } 
    818811 
    819812    $o.= "\n" . '</div>'; 
     
    835828        array( 'jquery' ), 
    836829        taxonomy_image_plugin_version() 
    837         ); 
     830    ); 
    838831    wp_localize_script( 'taxonomy-images-media-upload-popup', 'TaxonomyImagesModal', array ( 
    839832        'termBefore'  => esc_html__( '&#8220;', 'taxonomy-images' ), 
     
    843836        'removing'    => esc_html__( 'Removing &#8230;', 'taxonomy-images' ), 
    844837        'removed'     => esc_html__( 'Successfully Removed', 'taxonomy-images' ) 
    845         ) ); 
     838    ) ); 
    846839} 
    847840add_action( 'admin_print_scripts-media-upload-popup', 'taxonomy_image_plugin_media_upload_popup_js' ); 
     
    854847 */ 
    855848function taxonomy_image_plugin_edit_tags_js() { 
    856     if ( false == taxonomy_image_plugin_is_screen_active() ) { 
     849    if ( false == taxonomy_image_plugin_is_screen_active() ) 
    857850        return; 
    858     } 
     851 
    859852    wp_enqueue_script( 
    860853        'taxonomy-image-plugin-edit-tags', 
     
    862855        array( 'jquery', 'thickbox' ), 
    863856        taxonomy_image_plugin_version() 
    864         ); 
     857    ); 
    865858    wp_localize_script( 'taxonomy-image-plugin-edit-tags', 'taxonomyImagesPlugin', array ( 
    866859        'nonce'    => wp_create_nonce( 'taxonomy-image-plugin-remove-association' ), 
     
    868861        'tt_id'    => 0, 
    869862        'image_id' => 0, 
    870         ) ); 
     863    ) ); 
    871864} 
    872865add_action( 'admin_print_scripts-edit-tags.php', 'taxonomy_image_plugin_edit_tags_js' ); 
     
    880873 */ 
    881874function taxonomy_image_plugin_css_admin() { 
    882     if ( false == taxonomy_image_plugin_is_screen_active() && 'admin_print_styles-media-upload-popup' != current_filter() ) { 
     875    if ( false == taxonomy_image_plugin_is_screen_active() && 'admin_print_styles-media-upload-popup' != current_filter() ) 
    883876        return; 
    884     } 
     877 
    885878    wp_enqueue_style( 
    886879        'taxonomy-image-plugin-edit-tags', 
     
    889882        taxonomy_image_plugin_version(), 
    890883        'screen' 
    891         ); 
     884    ); 
    892885} 
    893886add_action( 'admin_print_styles-edit-tags.php', 'taxonomy_image_plugin_css_admin' ); 
     
    902895 */ 
    903896function taxonomy_image_plugin_css_thickbox() { 
    904     if ( false == taxonomy_image_plugin_is_screen_active() ) { 
     897    if ( false == taxonomy_image_plugin_is_screen_active() ) 
    905898        return; 
    906     } 
     899 
    907900    wp_enqueue_style( 'thickbox' ); 
    908901} 
     
    924917 */ 
    925918function taxonomy_image_plugin_css_public() { 
    926     if ( apply_filters( 'taxonomy-images-disable-public-css', false ) ) { 
     919    if ( apply_filters( 'taxonomy-images-disable-public-css', false ) ) 
    927920        return; 
    928     } 
     921 
    929922    wp_enqueue_style( 
    930923        'taxonomy-image-plugin-public', 
     
    933926        taxonomy_image_plugin_version(), 
    934927        'screen' 
    935         ); 
     928    ); 
    936929} 
    937930add_action( 'wp_print_styles', 'taxonomy_image_plugin_css_public' ); 
     
    959952function taxonomy_image_plugin_activate() { 
    960953    $associations = get_option( 'taxonomy_image_plugin' ); 
    961     if ( false === $associations ) { 
     954    if ( false === $associations ) 
    962955        add_option( 'taxonomy_image_plugin', array() ); 
    963     } 
     956 
    964957    $settings = get_option( 'taxonomy_image_plugin_settings' ); 
    965958    if ( false === $settings ) { 
    966959        add_option( 'taxonomy_image_plugin_settings', array( 
    967960            'taxonomies' => array() 
    968             ) ); 
     961        ) ); 
    969962    } 
    970963} 
     
    982975function taxonomy_image_plugin_is_screen_active() { 
    983976    $screen = get_current_screen(); 
    984     if ( ! isset( $screen->taxonomy ) ) { 
     977    if ( ! isset( $screen->taxonomy ) ) 
    985978        return false; 
    986     } 
    987979 
    988980    $settings = get_option( 'taxonomy_image_plugin_settings' ); 
    989     if ( ! isset( $settings['taxonomies'] ) ) { 
     981    if ( ! isset( $settings['taxonomies'] ) ) 
    990982        return false; 
    991     } 
    992  
    993     if ( in_array( $screen->taxonomy, $settings['taxonomies'] ) ) { 
     983 
     984    if ( in_array( $screen->taxonomy, $settings['taxonomies'] ) ) 
    994985        return true; 
    995     } 
     986 
    996987    return false; 
    997988} 
     
    10131004function taxonomy_image_plugin_cache_images( $posts ) { 
    10141005    $assoc = taxonomy_image_plugin_get_associations(); 
    1015     if ( empty( $assoc ) ) { 
     1006    if ( empty( $assoc ) ) 
    10161007        return; 
    1017     } 
    10181008 
    10191009    $tt_ids = array(); 
    10201010    foreach ( (array) $posts as $post ) { 
    1021         if ( ! isset( $post->ID ) || ! isset( $post->post_type ) ) { 
     1011        if ( ! isset( $post->ID ) || ! isset( $post->post_type ) ) 
    10221012            continue; 
    1023         } 
    10241013 
    10251014        $taxonomies = get_object_taxonomies( $post->post_type ); 
    1026         if ( empty( $taxonomies ) ) { 
     1015        if ( empty( $taxonomies ) ) 
    10271016            continue; 
    1028         } 
    10291017 
    10301018        foreach ( $taxonomies as $taxonomy ) { 
     
    10421030    $image_ids = array(); 
    10431031    foreach ( $tt_ids as $tt_id ) { 
    1044         if ( ! isset( $assoc[$tt_id] ) ) { 
     1032        if ( ! isset( $assoc[$tt_id] ) ) 
    10451033            continue; 
    1046         } 
    1047         if ( in_array( $assoc[$tt_id], $image_ids ) ) { 
     1034 
     1035        if ( in_array( $assoc[$tt_id], $image_ids ) ) 
    10481036            continue; 
    1049         } 
     1037 
    10501038        $image_ids[] = $assoc[$tt_id]; 
    10511039    } 
    10521040 
    1053     if ( empty( $image_ids ) ) { 
     1041    if ( empty( $image_ids ) ) 
    10541042        return; 
    1055     } 
    1056  
    1057     get_posts( array( 
     1043 
     1044    $images = get_posts( array( 
    10581045        'include'   => $image_ids, 
    10591046        'post_type' => 'attachment' 
    1060         ) ); 
     1047    ) ); 
    10611048} 
    10621049 
     
    11131100    if ( ! in_array( $taxonomy, (array) $settings['taxonomies'] ) ) { 
    11141101        trigger_error( sprintf( esc_html__( 'The %1$s taxonomy does not have image support. %2$s', 'taxonomy-images' ), 
    1115         '<strong>' . esc_html( $taxonomy ) . '</strong>', 
    1116         taxonomy_images_plugin_settings_page_link() 
     1102            '<strong>' . esc_html( $taxonomy ) . '</strong>', 
     1103            taxonomy_images_plugin_settings_page_link() 
    11171104        ) ); 
    11181105        return false; 
     
    11381125function taxonomy_image_plugin_please_use_filter( $function, $filter ) { 
    11391126    trigger_error( sprintf( esc_html__( 'The %1$s has been called directly. Please use the %2$s filter instead.', 'taxonomy-images' ), 
    1140     '<code>' . esc_html( $function . '()' ) . '</code>', 
    1141     '<code>' . esc_html( $filter ) . '</code>' 
     1127        '<code>' . esc_html( $function . '()' ) . '</code>', 
     1128        '<code>' . esc_html( $filter ) . '</code>' 
    11421129    ) ); 
    11431130} 
     
    11601147    static $plugin_name = ''; 
    11611148 
    1162     if ( empty( $plugin_name ) ) { 
     1149    if ( empty( $plugin_name ) ) 
    11631150        $plugin_name = plugin_basename( __FILE__ ); 
    1164     } 
    1165  
    1166     if ( $plugin_name != $file ) { 
     1151 
     1152    if ( $plugin_name != $file ) 
    11671153        return $links; 
    1168     } 
    11691154 
    11701155    $link = taxonomy_images_plugin_settings_page_link( __( 'Settings', 'taxonomy-images' ) ); 
    1171     if ( ! empty( $link ) ) { 
     1156    if ( ! empty( $link ) ) 
    11721157        $links[] = $link; 
    1173     } 
    11741158 
    11751159    $links[] = '<a href="http://wordpress.mfields.org/donate/">' . __( 'Donate', 'taxonomy-images' ) . '</a>'; 
     
    11901174 */ 
    11911175function taxonomy_images_plugin_settings_page_link( $link_text = '' ) { 
    1192     if ( empty( $link_text ) ) { 
     1176    if ( empty( $link_text ) ) 
    11931177        $link_text = __( 'Manage Settings', 'taxonomy-images' ); 
    1194     } 
    11951178 
    11961179    $link = ''; 
    1197     if ( current_user_can( 'manage_options' ) ) { 
     1180    if ( current_user_can( 'manage_options' ) ) 
    11981181        $link = '<a href="' . esc_url( add_query_arg( array( 'page' => 'taxonomy_image_plugin_settings' ), admin_url( 'options-general.php' ) ) ) . '">' . esc_html( $link_text ) . '</a>'; 
    1199     } 
    12001182 
    12011183    return $link; 
Note: See TracChangeset for help on using the changeset viewer.