Changeset 1176917

Timestamp:

06/08/2015 05:28:16 PM (11 years ago)

Author:

matthewordie

Message:

Fixed issue with ACF4 fields not loading

Location:

buckets/trunk

Files:

• README.md (modified) (1 prop)
• admin/add_bucket.php (modified) (1 prop)
• admin/shortcode.php (modified) (1 prop)
• buckets.php (modified) (7 diffs, 1 prop)
• css/bucket_field.css (modified) (1 prop)
• css/buckets.css (modified) (1 prop)
• css/popup.css (modified) (1 prop)
• css/tinymce.css (modified) (1 prop)
• fields/acf-buckets-v4.php (modified) (1 prop)
• fields/acf-buckets-v5.php (modified) (1 prop)
• img/button_add.png (modified) (1 prop) (previous)
• img/button_remove.png (modified) (1 prop) (previous)
• js/buckets.js (modified) (1 prop)
• js/media-upload.js (modified) (1 prop)
• js/popup.js (modified) (1 prop)
• js/tinymce.js (modified) (1 prop)
• js/tinymce/bucket.png (modified) (1 prop) (previous)
• js/tinymce/bucketshortcode.js (modified) (1 prop)
• js/tinymce/bucketshortcode.php (modified) (1 prop)
• readme.txt (modified) (1 diff, 1 prop)
• templates/visual_editor.php (modified) (1 prop)

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.3.0
+Version: 0.3.2
 Author URI: http://www.matthewrestorff.com
 */
@@ -17 +17 @@
 *
 *-------------------------------------------------------------------------------------*/
-$bucket_version = '0.3.0';
+$bucket_version = '0.3.2';
 add_action('init', 'buckets_init');
 add_action( 'admin_head', 'buckets_admin_head' );
@@ -75 +75 @@
     ));
 
-    // Create TinyMCE Button
-    create_tinymce_button();
-
 }
 
@@ -188 +185 @@
 *
 *-------------------------------------------------------------------------------------*/
-function include_field_types_buckets($acf_version)
-{
+function include_field_types_buckets()
+{
+    global $acf_version;
     remove_post_type_support( 'buckets', 'editor' );
     include_once(WP_PLUGIN_DIR . '/buckets/fields/acf-buckets-v'. $acf_version . '.php');
@@ -197 +195 @@
 if (is_plugin_active('advanced-custom-fields-pro/acf.php')) {
     add_action('acf/include_field_types', 'include_field_types_buckets');
-    do_action('5'); // ACF v5.x
+    $acf_version = '5';
 } elseif (is_plugin_active('advanced-custom-fields/acf.php')) {
     add_action('acf/register_fields', 'include_field_types_buckets');
-    do_action('4'); // ACF v4.x
+    $acf_version = '4';
 }
 
@@ -410 +408 @@
 function buckets_admin_head()
 {
+
     global $bucket_version;
 
@@ -429 +428 @@
         array( 'thickbox' )
     );
+
+    // Create TinyMCE Button
+    create_tinymce_button();
+
 }
 

buckets/trunk/readme.txt

@@ -41 +41 @@
 
 == Changelog ==
+= 0.3.2 =
+[Fixed] - Fields weren't loading properly with ACF 4
+
+= 0.3.1 =
+[Fixed] - TinyMCE button CSS was loading incorrectly
+
 = 0.3.0 =
 [Added] - Updated Buckets for ACF Pro v5+