Changeset 738526

Timestamp:

07/10/2013 02:44:14 AM (13 years ago)

Author:

matthewordie

Message:

Updated for ACF 4.0

Location:

buckets/trunk

Files:

• buckets.php (modified) (4 diffs)
• fields/buckets.php (modified) (11 diffs)
• readme.txt (modified) (1 diff)

buckets/trunk/buckets.php

@@ -5 +5 @@
 Description: A Widget Alternative. Add reusable content inside of content. On a per page basis.
 Author: Matthew Restorff
-Version: 0.1.9.3
+Version: 0.2
 Author URI: http://www.matthewrestorff.com 
 */  
@@ -17 +17 @@
 * 
 *-------------------------------------------------------------------------------------*/
-$bucket_version = '0.1.9.3';
+$bucket_version = '0.2';
 add_action('init', 'buckets_init');
 add_action( 'admin_head', 'buckets_admin_head' );
 add_shortcode( 'bucket', 'buckets_shortcode' );
+include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+// Make Sure ACF is loaded
+if (is_plugin_active('advanced-custom-fields/acf.php')) {
+    add_action('acf/register_fields', 'register_bucket_fields');
+}
+
 
 
@@ -66 +72 @@
     create_tinymce_button();
 
-
-    
-    // Make Sure ACF is loaded
-    include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-    if (is_plugin_active('advanced-custom-fields/acf.php')) 
-    {
-        remove_post_type_support( 'buckets', 'editor' );
-        load_first();
-        register_field('Buckets_field', WP_PLUGIN_DIR . '/buckets/fields/buckets.php');
-        create_bucket_field_groups();
-    }
-
+    //Load Before ACF
+    load_first();
+
+}
+
+
+
+
+/*--------------------------------------------------------------------------------------
+*
+*   register_bucket_fields
+*   Registers the Buckets fields and adds the default field groups. 
+*
+*   @author Matthew Restorff
+* 
+*-------------------------------------------------------------------------------------*/
+
+function register_bucket_fields()
+{
+    remove_post_type_support( 'buckets', 'editor' );
+    include_once(WP_PLUGIN_DIR . '/buckets/fields/buckets.php');
+    create_bucket_field_groups();
 }
 
@@ -162 +178 @@
 
         add_post_meta($post_id, '_edit_last', '1');
-        add_post_meta($post_id, 'field_bucketskey778', 'a:8:{s:5:"label";s:7:"Sidebar";s:4:"name";s:7:"sidebar";s:4:"type";s:13:"buckets_field";s:12:"instructions";s:0:"";s:8:"required";s:1:"0";s:3:"max";s:0:"";s:3:"key";s:19:"field_bucketskey778";s:8:"order_no";s:1:"0";}');
+        add_post_meta($post_id, 'field_bucketskey778', 'a:9:{s:3:"key";s:19:"field_bucketskey778";s:5:"label";s:7:"Sidebar";s:4:"name";s:7:"sidebar";s:4:"type";s:7:"buckets";s:12:"instructions";s:0:"";s:8:"required";s:1:"0";s:3:"max";s:0:"";s:17:"conditional_logic";a:3:{s:6:"status";s:1:"0";s:5:"rules";a:1:{i:0;a:2:{s:5:"field";s:4:"null";s:8:"operator";s:2:"==";}}s:8:"allorany";s:3:"all";}s:8:"order_no";i:0;}');
         add_post_meta($post_id, 'allorany', 'all');
         add_post_meta($post_id, 'rule', 'a:4:{s:5:"param";s:9:"post_type";s:8:"operator";s:2:"==";s:5:"value";s:4:"page";s:8:"order_no";s:1:"0";}');

buckets/trunk/fields/buckets.php

@@ -1 +1 @@
 <?php
 
-class Buckets_field extends acf_Field
+class acf_field_buckets extends acf_field
 {
-    
-    /*--------------------------------------------------------------------------------------
-    *
-    *   Constructor
-    *
-    *   @author Elliot Condon
-    *   @since 1.0.0
-    *   @updated 2.2.0
-    * 
-    *-------------------------------------------------------------------------------------*/
-    
-    function __construct($parent)
+    // vars
+    var $defaults;
+    
+    
+    /*
+    *  __construct
+    *
+    *  Set name / label needed for actions / filters
+    *
+    *  @since   3.6
+    *  @date    23/01/13
+    */
+    
+    function __construct()
     {
-        parent::__construct($parent);
+        // vars
+        $this->name = 'buckets';
+        $this->label = __("Buckets Sidebar",'acf');
+        $this->category = __("Relational",'acf');
+        $this->defaults = array(
+            'post_type' =>  array('buckets'),
+            'max'       =>  '',
+            'taxonomy'  =>  array('all'),
+            'filters'   =>  array('search'),
+            'result_elements' => array('post_title', 'post_type')
+        );
+        
+        
+        // do not delete!
+        parent::__construct();
         
-        $this->name = 'buckets_field';
-        $this->title = __("Buckets Sidebar",'acf');
-        
-        add_action('wp_ajax_acf_get_bucket_results', array($this, 'acf_get_bucket_results'));
-    }
+        
+        // extra
+        add_action('wp_ajax_acf/fields/relationship/query_posts', array($this, 'query_posts'));
+        add_action('wp_ajax_nopriv_acf/fields/relationship/query_posts', array($this, 'query_posts'));
+    }
+    
+    
+    /*
+    *  load_field()
+    *  
+    *  This filter is appied to the $field after it is loaded from the database
+    *  
+    *  @type filter
+    *  @since 3.6
+    *  @date 23/01/13
+    *  
+    *  @param $field - the field array holding all the field options
+    *  
+    *  @return $field - the field array holding all the field options
+    */
+    
+    function load_field( $field )
+    {
+        // defaults
+        $field = array_merge($this->defaults, $field);
+        
+        
+        // validate post_type
+        if( !$field['post_type'] || !is_array($field['post_type']) || in_array('', $field['post_type']) )
+        {
+            $field['post_type'] = array( 'all' );
+        }
+
+        
+        // validate taxonomy
+        if( !$field['taxonomy'] || !is_array($field['taxonomy']) || in_array('', $field['taxonomy']) )
+        {
+            $field['taxonomy'] = array( 'all' );
+        }
+        
+        
+        // validate result_elements
+        if( !is_array( $field['result_elements'] ) )
+        {
+            $field['result_elements'] = array();
+        }
+        
+        if( !in_array('post_title', $field['result_elements']) )
+        {
+            $field['result_elements'][] = 'post_title';
+        }
+        
+        
+        // filters
+        if( !is_array( $field['filters'] ) )
+        {
+            $field['filters'] = array();
+        }
+        
+        
+        // return
+        return $field;
+    }
+        
+
+    /*
+    *  posts_where
+    *
+    *  @description: 
+    *  @created: 3/09/12
+    */
     
-    
-    /*--------------------------------------------------------------------------------------
-    *
-    *   acf_get_relationship_results
-    *
-    *   @author Elliot Condon
-    *   @description: Generates HTML for Left column relationship results
-    *   @created: 5/07/12
-    * 
-    *-------------------------------------------------------------------------------------*/
-    
-    function acf_get_bucket_results()
+    function posts_where( $where, &$wp_query )
+    {
+        global $wpdb;
+        
+        if ( $title = $wp_query->get('like_title') )
+        {
+            $where .= " AND " . $wpdb->posts . ".post_title LIKE '%" . esc_sql( like_escape(  $title ) ) . "%'";
+        }
+        
+        return $where;
+    }
+    
+    
+    /*
+    *  query_posts
+    *
+    *  @description: 
+    *  @since: 3.6
+    *  @created: 27/01/13
+    */
+    
+    function query_posts()
     {
         // vars
         $options = array(
-            'post_type' =>  'buckets',
+            'post_type' => 'all',
+            'taxonomy' => 'all',
             'posts_per_page' => 10,
             'paged' => 0,
@@ -47 +140 @@
             'suppress_filters' => false,
             's' => '',
+            'lang' => false,
+            'update_post_meta_cache' => false,
+            'field_key' => '',
+            'nonce' => '',
+            'ancestor' => false,
         );
-        $ajax = isset( $_POST['action'] ) ? true : false;
-
-        
-        // override options with posted values
-        if( $ajax )
-        {
-            $options = array_merge($options, $_POST);
-        }
+        
+        $options = array_merge( $options, $_POST );
+        
+        
+        // validate
+        if( !wp_verify_nonce($options['nonce'], 'acf_nonce') )
+        {
+            die(0);
+        }
+        
+        
+        // WPML
+        if( $options['lang'] )
+        {
+            global $sitepress;
+            
+            $sitepress->switch_lang( $options['lang'] );
+        }
+        
+        
+        // convert types
+        $options['post_type'] = explode(',', $options['post_type']);
+        $options['taxonomy'] = explode(',', $options['taxonomy']);
+        
+        
+        // load all post types by default
+        if( in_array('all', $options['post_type']) )
+        {
+            $options['post_type'] = apply_filters('acf/get_post_types', array());
+        }
+        
+        
+        // attachment doesn't work if it is the only item in an array???
+        if( is_array($options['post_type']) && count($options['post_type']) == 1 )
+        {
+            $options['post_type'] = $options['post_type'][0];
+        }
+        
+        
+        // create tax queries
+        if( ! in_array('all', $options['taxonomy']) )
+        {
+            // vars
+            $taxonomies = array();
+            $options['tax_query'] = array();
+            
+            foreach( $options['taxonomy'] as $v )
+            {
+                
+                // find term (find taxonomy!)
+                // $term = array( 0 => $taxonomy, 1 => $term_id )
+                $term = explode(':', $v); 
+                
+                
+                // validate
+                if( !is_array($term) || !isset($term[1]) )
+                {
+                    continue;
+                }
+                
+                
+                // add to tax array
+                $taxonomies[ $term[0] ][] = $term[1];
+                
+            }
+            
+            
+            // now create the tax queries
+            foreach( $taxonomies as $k => $v )
+            {
+                $options['tax_query'][] = array(
+                    'taxonomy' => $k,
+                    'field' => 'id',
+                    'terms' => $v,
+                );
+            }
+        }
+        
+        unset( $options['taxonomy'] );
         
         
@@ -69 +238 @@
         
         
+        // load field
+        $field = array();
+        if( $options['ancestor'] )
+        {
+            $ancestor = apply_filters('acf/load_field', array(), $options['ancestor'] );
+            $field = acf_get_child_field_from_parent_field( $options['field_key'], $ancestor );
+        }
+        else
+        {
+            $field = apply_filters('acf/load_field', array(), $options['field_key'] );
+        }
+        
+        
+        // get the post from which this field is rendered on
+        $the_post = get_post( $options['post_id'] );
+        
+        
+        // filters
+        $options = apply_filters('acf/fields/relationship/query', $options, $field, $the_post);
+        $options = apply_filters('acf/fields/relationship/query/name=' . $field['name'], $options, $field, $the_post );
+        $options = apply_filters('acf/fields/relationship/query/key=' . $field['key'], $options, $field, $the_post );
+        
+        
+        $results = '';
+        
+        
         // load the posts
         $posts = get_posts( $options );
+        
         if( $posts )
         {
-            foreach( $posts  as $post )
+            foreach( $posts  as $p )
             {
                 // right aligned info
-                $layout = false;
                 $title = '<span class="relationship-item-info">';
-                    while(has_sub_field('buckets', $post->ID)){
-                        $layout = str_replace('_', ' ', get_row_layout());
+                    
+                    if( in_array('post_type', $field['result_elements']) )
+                    {
+                        $title .= $p->post_type;
                     }
-                    $title .= $layout;
+                    
+                    // WPML
+                    if( $options['lang'] )
+                    {
+                        $title .= ' (' . $options['lang'] . ')';
+                    }
                     
                 $title .= '</span>';
                 
+                
+                // featured_image
+                if( in_array('featured_image', $field['result_elements']) )
+                {
+                    $image = get_the_post_thumbnail( $p->ID, array(21, 21) );
+                    
+                    $title .= '<div class="result-thumbnail">' . $image . '</div>';
+                }
+                
+                
                 // find title. Could use get_the_title, but that uses get_post(), so I think this uses less Memory
-                $title .= apply_filters( 'the_title', $post->post_title, $post->ID );
+                $title .= apply_filters( 'the_title', $p->post_title, $p->ID );
 
                 // status
-                if($post->post_status != "publish")
+                if($p->post_status != "publish")
                 {
-                    $title .= " ($post->post_status)";
+                    $title .= " ($p->post_status)";
                 }
                 
-                echo '<li><span class="edit" data-url="' . get_admin_url() . 'post.php?post=' . $post->ID . '&action=edit&popup=true&KeepThis=true&TB_iframe=true&height=200&width=200">Edit</span><a href="' . get_permalink($post->ID) . '" data-post_id="' . $post->ID . '">' . $title .  '<span class="add"></span></a></li>';
+                // filters
+                $title = apply_filters('acf/fields/relationship/result', $title, $p, $field, $the_post);
+                $title = apply_filters('acf/fields/relationship/result/name=' . $field['name'] , $title, $p, $field, $the_post);
+                $title = apply_filters('acf/fields/relationship/result/key=' . $field['key'], $title, $p, $field, $the_post);
+                
+                
+                $results .= '<li><a href="' . get_permalink($p->ID) . '" data-post_id="' . $p->ID . '">' . $title .  '<span class="acf-button-add"></span></a></li>';
             }
         }
         
         
-        // die?
-        if( $ajax )
-        {
-            die();
-        }
-        
-    }
-    
-    
-    /*--------------------------------------------------------------------------------------
-    *
-    *   admin_print_scripts / admin_print_styles
-    *
-    *   @author Elliot Condon
-    *   @since 3.0.0
-    * 
-    *-------------------------------------------------------------------------------------*/
-    
-    function admin_print_scripts()
+        echo $results;
+        die();
+            
+    }
+    
+    
+    /*
+    *  create_field()
+    *
+    *  Create the HTML interface for your field
+    *
+    *  @param   $field - an array holding all the field's data
+    *
+    *  @type    action
+    *  @since   3.6
+    *  @date    23/01/13
+    */
+    
+    function create_field( $field )
     {
-        wp_enqueue_script(array(
-            'jquery-ui-sortable',
-        ));
-    }
-    
-    function admin_print_styles()
-    {
-  
-    }
-        
-    
-    /*--------------------------------------------------------------------------------------
-    *
-    *   create_field
-    *
-    *   @author Elliot Condon
-    *   @since 2.0.5
-    *   @updated 2.2.0
-    * 
-    *-------------------------------------------------------------------------------------*/
-    
-    function create_field($field)
-    {
-        // vars
-        $defaults = array(
-            'post_type' =>  'buckets',
-            'max'       =>  -1,
+        // global
+        global $post;
+
+        
+        // no row limit?
+        if( !$field['max'] || $field['max'] < 1 )
+        {
+            $field['max'] = 9999;
+        }
+        
+        
+        // class
+        $class = '';
+        if( $field['filters'] )
+        {
+            foreach( $field['filters'] as $filter )
+            {
+                $class .= ' has-' . $filter;
+            }
+        }
+        
+        $attributes = array(
+            'max' => $field['max'],
+            's' => '',
+            'paged' => 1,
+            'post_type' => implode(',', $field['post_type']),
+            'taxonomy' => implode(',', $field['taxonomy']),
+            'field_key' => $field['key']
         );
         
-        $field = array_merge($defaults, $field);
-        
-        
-        // validate types
-        $field['max'] = (int) $field['max'];
-        
-        
-        // row limit <= 0?
-        if( $field['max'] <= 0 )
-        {
-            $field['max'] = 9999;
-        }
-        
-        $field['type'] = 'relationship';
+        
+        // Lang
+        if( defined('ICL_LANGUAGE_CODE') )
+        {
+            $attributes['lang'] = ICL_LANGUAGE_CODE;
+        }
+        
+        
+        // parent
+        preg_match('/\[(field_.*?)\]/', $field['name'], $ancestor);
+        if( isset($ancestor[1]) && $ancestor[1] != $field['key'])
+        {
+            $attributes['ancestor'] = $ancestor[1];
+        }
+                
         ?>
-<div class="acf_buckets" data-max="<?php echo $field['max']; ?>" data-s="" data-paged="1" data-post_type="buckets">
+<div class="acf_relationship<?php echo $class; ?>"<?php foreach( $attributes as $k => $v ): ?> data-<?php echo $k; ?>="<?php echo $v; ?>"<?php endforeach; ?>>
     
     <!-- Hidden Blank default value -->
@@ -171 +391 @@
     <script type="text/html" class="tmpl-li">
     <li>
-        <span class="edit" data-url="<?php echo get_admin_url() ?>post.php?post={post_id}&action=edit&popup=true&TB_iframe=1">Edit</span>
-        <a href="#" data-post_id="{post_id}">{title}<span class="remove"></span></a>
+        <a href="#" data-post_id="{post_id}">{title}<span class="acf-button-remove"></span></a>
         <input type="hidden" name="<?php echo $field['name']; ?>[]" value="{post_id}" />
     </li>
@@ -179 +398 @@
     
     <!-- Left List -->
-
     <div class="relationship_left">
         <table class="widefat">
             <thead>
+                <?php if(in_array( 'search', $field['filters']) ): ?>
                 <tr>
                     <th>
                         <label class="relationship_label" for="relationship_<?php echo $field['name']; ?>"><?php _e("Search",'acf'); ?>...</label>
                         <input class="relationship_search" type="text" id="relationship_<?php echo $field['name']; ?>" />
-                        <div class="clear_relationship_search"></div>
+                        <!-- <div class="clear_relationship_search"></div> -->
                     </th>
                 </tr>
+                <?php endif; ?>
+                <?php if(in_array( 'post_type', $field['filters']) ): ?>
+                <tr>
+                    <th>
+                        <?php 
+                        
+                        // vars
+                        $choices = array(
+                            'all' => 'Filter by post type'
+                        );
+                        
+                        
+                        if( in_array('all', $field['post_type']) )
+                        {
+                            $post_types = apply_filters( 'acf/get_post_types', array() );
+                            $choices = array_merge( $choices, $post_types);
+                        }
+                        else
+                        {
+                            foreach( $field['post_type'] as $post_type )
+                            {
+                                $choices[ $post_type ] = $post_type;
+                            }
+                        }
+                        
+                        
+                        // create field
+                        do_action('acf/create_field', array(
+                            'type'  =>  'select',
+                            'name'  =>  '',
+                            'class' =>  'select-post_type',
+                            'value' =>  '',
+                            'choices' => $choices,
+                        ));
+                        
+                        ?>
+                    </th>
+                </tr>
+                <?php endif; ?>
             </thead>
         </table>
@@ -197 +455 @@
             </li>
         </ul>
-        <a href="<?php echo bloginfo('url'); ?>/wp-admin/post-new.php?post_type=buckets&popup=true&TB_iframe=1" title="New Bucket" class="button-primary new-bucket thickbox">Add New</a>
     </div>
     <!-- /Left List -->
@@ -205 +462 @@
         <ul class="bl relationship_list">
         <?php
-
         if( $field['value'] )
         {
-            foreach( $field['value'] as $post )
+            foreach( $field['value'] as $p )
             {
+                // right aligned info
+                $title = '<span class="relationship-item-info">';
+                    
+                    if( in_array('post_type', $field['result_elements']) )
+                    {
+                        $title .= $p->post_type;
+                    }
+                    
+                    // WPML
+                    if( defined('ICL_LANGUAGE_CODE') )
+                    {
+                        $title .= ' (' . ICL_LANGUAGE_CODE . ')';
+                    }
+                    
+                $title .= '</span>';
+                
+                
+                // featured_image
+                if( in_array('featured_image', $field['result_elements']) )
+                {
+                    $image = get_the_post_thumbnail( $p->ID, array(21, 21) );
+                    
+                    $title .= '<div class="result-thumbnail">' . $image . '</div>';
+                }
+                
                 
                 // find title. Could use get_the_title, but that uses get_post(), so I think this uses less Memory
-                $title = apply_filters( 'the_title', $post->post_title, $post->ID );
-
+                $title .= apply_filters( 'the_title', $p->post_title, $p->ID );
 
                 // status
-                if($post->post_status == "private" || $post->post_status == "draft")
+                if($p->post_status != "publish")
                 {
-                    $title .= " ($post->post_status)";
+                    $title .= " ($p->post_status)";
                 }
+
+                
+                // filters
+                $title = apply_filters('acf/fields/relationship/result', $title, $p, $field, $post);
+                $title = apply_filters('acf/fields/relationship/result/name=' . $field['name'] , $title, $p, $field, $post);
+                $title = apply_filters('acf/fields/relationship/result/key=' . $field['key'], $title, $p, $field, $post);
+                
                 
                 echo '<li>
-                    <span class="edit" data-url="' . get_admin_url() . 'post.php?post=' . $post->ID . '&action=edit&popup=true&TB_iframe=1">Edit</span>
-                    <a href="javascript:;" class="" data-post_id="' . $post->ID . '">' . $title . '<span class="remove"></span></a>
-                    <input type="hidden" name="' . $field['name'] . '[]" value="' . $post->ID . '" />
+                    <a href="' . get_permalink($p->ID) . '" class="" data-post_id="' . $p->ID . '">' . $title . '<span class="acf-button-remove"></span></a>
+                    <input type="hidden" name="' . $field['name'] . '[]" value="' . $p->ID . '" />
                 </li>';
+                
+                    
             }
         }
@@ -231 +519 @@
         ?>
         </ul>
-        
     </div>
     <!-- / Right List -->
-    <div style="clear: both;"></div>
+    
 </div>
-
-
         <?php
-
-    
-    }
-    
-    
-    /*--------------------------------------------------------------------------------------
-    *
-    *   create_options
-    *
-    *   @author Elliot Condon
-    *   @since 2.0.6
-    *   @updated 2.2.0
-    * 
-    *-------------------------------------------------------------------------------------*/
-    
-    function create_options($key, $field)
+    }
+    
+    
+    
+    /*
+    *  create_options()
+    *
+    *  Create extra options for your field. This is rendered when editing a field.
+    *  The value of $field['name'] can be used (like bellow) to save extra data to the $field
+    *
+    *  @type    action
+    *  @since   3.6
+    *  @date    23/01/13
+    *
+    *  @param   $field  - an array holding all the field's data
+    */
+    
+    function create_options( $field )
     {
         // vars
-        $defaults = array(
-            'post_type' =>  'buckets',
-            'max'       =>  '',
-            'taxonomy'  =>  array('all'),
-        );
-        
-        $field = array_merge($defaults, $field);
+        $field = array_merge($this->defaults, $field);
+        $key = $field['name'];
         
         ?>
-        
-        <tr class="field_option field_option_<?php echo $this->name; ?>">
-            <td class="label">
-                <label><?php _e("Maximum posts",'acf'); ?></label>
-            </td>
-            <td>
-                <?php 
-                $this->parent->create_field(array(
-                    'type'  =>  'text',
-                    'name'  =>  'fields['.$key.'][max]',
-                    'value' =>  $field['max'],
-                ));
-                ?>
-            </td>
-        </tr>
+
+
+<tr class="field_option field_option_<?php echo $this->name; ?>">
+    <td class="label">
+        <label><?php _e("Maximum posts",'acf'); ?></label>
+    </td>
+    <td>
+        <?php 
+        do_action('acf/create_field', array(
+            'type'  =>  'text',
+            'name'  =>  'fields['.$key.'][max]',
+            'value' =>  $field['max'],
+        ));
+        ?>
+    </td>
+</tr>
         <?php
-    }
-    
-
-    /*--------------------------------------------------------------------------------------
-    *
-    *   get_value
-    *
-    *   @author Elliot Condon
-    *   @since 3.3.3
-    * 
-    *-------------------------------------------------------------------------------------*/
-    
-    function get_value($post_id, $field)
+        
+    }
+    
+    
+    /*
+    *  format_value()
+    *
+    *  This filter is appied to the $value after it is loaded from the db and before it is passed to the create_field action
+    *
+    *  @type    filter
+    *  @since   3.6
+    *  @date    23/01/13
+    *
+    *  @param   $value  - the value which was loaded from the database
+    *  @param   $post_id - the $post_id from which the value was loaded
+    *  @param   $field  - the field array holding all the field options
+    *
+    *  @return  $value  - the modified value
+    */
+    
+    function format_value( $value, $post_id, $field, $output = false )
     {
-        // get value
-        $value = parent::get_value($post_id, $field);
-                
         // empty?
         if( !$value )
@@ -319 +607 @@
         }
         
-
         
         // find posts (DISTINCT POSTS)
@@ -325 +612 @@
             'numberposts' => -1,
             'post__in' => $value,
-            'post_type' =>  get_post_types( array('public' => true) ),
+            'post_type' =>  apply_filters('acf/get_post_types', array()),
             'post_status' => array('publish', 'private', 'draft', 'inherit', 'future'),
         ));
@@ -331 +618 @@
         
         $ordered_posts = array();
-        foreach( $posts as $post )
-        {   
+        foreach( $posts as $p )
+        {
             // create array to hold value data
-            $ordered_posts[ $post->ID ] = $post;
-        }
-        
-        
+            $ordered_posts[ $p->ID ] = $p;
+        }
+        
+        $buckets = false; 
         // override value array with attachments
         foreach( $value as $k => $v)
         {
-            $value[ $k ] = $ordered_posts[ $v ];
-
-        }
-                        
+            // check that post exists (my have been trashed)
+            if( !isset($ordered_posts[ $v ]) )
+            {
+                unset( $value[ $k ] );
+            }
+            else
+            {
+                $buckets .= get_bucket($v);
+                $value[ $k ] = $ordered_posts[ $v ];
+            }
+        }
+        
+        
         // return value
+        if ($output == true){
+            return $buckets; 
+        }
         return $value;  
     }
     
-
-
-    function get_value_for_api($post_id, $field)
+    
+    /*
+    *  format_value_for_api()
+    *
+    *  This filter is appied to the $value after it is loaded from the db and before it is passed back to the api functions such as the_field
+    *
+    *  @type    filter
+    *  @since   3.6
+    *  @date    23/01/13
+    *
+    *  @param   $value  - the value which was loaded from the database
+    *  @param   $post_id - the $post_id from which the value was loaded
+    *  @param   $field  - the field array holding all the field options
+    *
+    *  @return  $value  - the modified value
+    */
+    
+    function format_value_for_api( $value, $post_id, $field )
     {
-        // get value
-        $value = parent::get_value($post_id, $field);
-                
-        // empty?
-        if( !$value )
-        {
-            return $value;
-        }
-        
-        
-        // Pre 3.3.3, the value is a string coma seperated
-        if( !is_array($value) )
-        {
-            $value = explode(',', $value);
-        }
-        
-        
-        // empty?
-        if( empty($value) )
-        {
-            return $value;
-        }
-        
-
-        
-        // find posts (DISTINCT POSTS)
-        $posts = get_posts(array(
-            'numberposts' => -1,
-            'post__in' => $value,
-            'post_type' =>  get_post_types( array('public' => true) ),
-            'post_status' => array('publish', 'private', 'draft', 'inherit', 'future'),
-        ));
-
-        
-        $ordered_posts = array();
-        foreach( $posts as $post )
-        {   
-            // create array to hold value data
-            $ordered_posts[ $post->ID ] = $post;
-        }
-        
-        $buckets = false;
-        // override value array with attachments
-        foreach( $value as $k => $v)
-        {
-            $buckets .= get_bucket($v);
-            $value[ $k ] = $ordered_posts[ $v ];
-
-        }
-        
-
-        return $buckets;
-
-    }
-
+        return $this->format_value( $value, $post_id, $field, true );
+    }
+    
+    
+    /*
+    *  update_value()
+    *
+    *  This filter is appied to the $value before it is updated in the db
+    *
+    *  @type    filter
+    *  @since   3.6
+    *  @date    23/01/13
+    *
+    *  @param   $value - the value which will be saved in the database
+    *  @param   $post_id - the $post_id of which the value will be saved
+    *  @param   $field - the field array holding all the field options
+    *
+    *  @return  $value - the modified value
+    */
+    
+    function update_value( $value, $post_id, $field )
+    {
+        // array?
+        if( is_array($value) ){ foreach( $value as $k => $v ){
+            
+            // object?
+            if( is_object($v) && isset($v->ID) )
+            {
+                $value[ $k ] = $v->ID;
+            }
+            
+        }}
+                
+        
+        return $value;
+    }
     
 }
 
+new acf_field_buckets();
+
 ?>

buckets/trunk/readme.txt

@@ -42 +42 @@
 
 == Changelog ==
+= 0.2 = 
+[Fixed] - Updated Buckets plugin to work with ACF 4.0. 
+
 = 0.1.9.3 = 
 [Fixed] - Removed ZeroClipboard function because of security exploit found.