Changeset 697067

Timestamp:

04/13/2013 07:59:01 PM (13 years ago)

Author:

doodlebee

Message:

Fix for WooThemes Canvas conflict

Location:

back-end-instructions/trunk

Files:

• instructions.php (modified) (5 diffs)
• readme.txt (modified) (2 diffs)

back-end-instructions/trunk/instructions.php

@@ -5 +5 @@
 Description: Plugin to provide nice little instructions for back-end WordPress users
 Author: Shelly Cole
-Version: 2.5.1
+Version: 2.5.2
 Author URI: http://brassblogs.com
 License: GPLv2
@@ -521 +521 @@
 add_action('load-'.$pagenow, 'add_bei_instructions_button');
 function add_bei_instructions_button() {
-    global $current_user, $user_level, $post, $pagenow, $endofurl, $class, $address, $pluginloc, $options;
+    global $wpdb, $current_user, $user_level, $post, $pagenow, $endofurl, $class, $address, $pluginloc, $options;
     
     $screen = get_current_screen();
@@ -531 +531 @@
     
     $ids = array();                                                                         // set up array of ID's that fit
-    $instruction_query = new WP_Query(array('post_type' => 'instructions', 'post_status' => 'publish' ) );      // query
-    
-    if($instruction_query->have_posts()) : while($instruction_query->have_posts()) : $instruction_query->the_post();
-        $post_id = get_the_ID();
+    // we must use a custom select query, and NOT us "setup_postdata", because the $post variable conflicts with other plugins
+    $sql = "SELECT $wpdb->posts.* FROM $wpdb->posts WHERE $wpdb->posts.post_type = 'instructions' AND $wpdb->posts.post_status = 'publish'";
+    $instructions = $wpdb->get_results($sql, OBJECT);
+    if( $instructions ) :
+        foreach( $instructions as $ins ) : 
+        $post_id = $ins->ID;
         $instruction_info = get_post_meta($post_id, 'instructions');
         $page = $instruction_info[0]['page_id'];                                            // page this is supposed to be on
@@ -540 +542 @@
         $ids[] = $post_id;
 
-    endwhile;
+    endforeach;
     endif;
 
@@ -549 +551 @@
             $instruction_info = $instruction_info[0]; 
             $page = $instruction_info['page_id'];                                           // page for this instruction to be displayed on
-            $multi = $instruction_info['multi'];                                            // secondary pages, if any (this will be an array)
+            if(!empty($instruction_info['multi']))
+                $multi = $instruction_info['multi'];                                            // secondary pages, if any (this will be an array)
             $level = $instruction_info['user_level'];                                       // level that can see this instruction
             $video = $instruction_info['video_url'];                                        // video url

back-end-instructions/trunk/readme.txt

@@ -4 +4 @@
 Tags: developers, clients, instructions
 Requires at least: 3.1
-Tested up to: 3.5
-Stable tag: 2.5.1
+Tested up to: 3.5.1
+Stable tag: 2.5.2
 License: GPLv2 or later
 
@@ -147 +147 @@
 == Changelog ==
 
+= 2.5.2 =
+* Bugfix: swapped a custom loop for a custom query to fix a reported conflict with a WooThemes theme.
+
 = 2.5.1 =
 * Bugfix: missing variable.