Changeset 944924

Timestamp:

07/08/2014 12:55:17 PM (12 years ago)

Author:

AlphaGolf_fr

Message:

Update the trunk with 0.29.12

Location:

wp-symposium-toolbar/trunk

Files:

• readme.txt (modified) (1 diff)
• wp-symposium-toolbar.php (modified) (2 diffs)
• wp-symposium-toolbar_admin_functions.php (modified) (1 diff)

wp-symposium-toolbar/trunk/readme.txt

@@ -9 +9 @@
 Tested up to: 3.9
 Stable tag: 0.29.0
-Version: 0.29.11
+Version: 0.29.12
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

wp-symposium-toolbar/trunk/wp-symposium-toolbar.php

@@ -11 +11 @@
 Tested up to: 3.9
 Stable tag: 0.29.0
-Version: 0.29.11
+Version: 0.29.12
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -23 +23 @@
 // Increase Build nr at each version
 global $wpst_buildnr;
-$wpst_buildnr = 2911;
+$wpst_buildnr = 2912;
 
 

wp-symposium-toolbar/trunk/wp-symposium-toolbar_admin_functions.php

@@ -1530 +1530 @@
                         // Get post data for these items, and add nav_menu_item data
                         if ( $items ) {
-                            $sql = "SELECT * FROM ".$wpdb->base_prefix."posts WHERE ID IN ( ".implode( ",", $items )." ) AND post_type = 'nav_menu_item' AND post_status = 'publish' ORDER BY menu_order ASC ";
+                            global $blog_id;
+                            $wpdb_prefix = ( $blog_id == "1" ) ? $wpdb->base_prefix : $wpdb->base_prefix.$blog_id."_";
+                            $sql = "SELECT * FROM ".$wpdb_prefix."posts WHERE ID IN ( ".implode( ",", $items )." ) AND post_type = 'nav_menu_item' AND post_status = 'publish' ORDER BY menu_order ASC ";
                             $menu_items = array_map( 'wp_setup_nav_menu_item', $wpdb->get_results( $sql ) );
                         }