Changeset 944996

Timestamp:

07/08/2014 03:19:31 PM (12 years ago)

Author:

AlphaGolf_fr

Message:

Update the trunk with 0.29.13

Location:

wp-symposium-toolbar/trunk

Files:

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

wp-symposium-toolbar/trunk/readme.txt

@@ -149 +149 @@
 * Change: Styles, add a setting to limit the width of Toolbar items container, so admins can align Toolbar items with page content
 * Bugfix: Styles, missing Toolbar shadow in responsive mode
-* Change: code improvement, simplify the way avatars are removed from Toolbar
+* Change: code improvement, simplify the way avatars are hidden from Toolbar
+* Bugfix: Custom Menus, get rid of PHP notices when adding a new menu and no menu exists already
 
 = 0.29.0. =

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

@@ -1067 +1067 @@
                             echo ' style="outline:1px solid #CC0000;" onclick="this.style.outline = \'none\';"';
                         }
-                        echo '/><span> ' . __( 'Display the notification icons accross the whole network to this site\'s users (if unchecked, this site\'s features will be displayed only on this site\'s Toolbar)', 'wp-symposium-toolbar' ) . '</span>';
+                        echo '/><span> ' . __( 'Share WP Symposium features of this site (notification icons and Profile page URL) accross the whole network for this site\'s users (if unchecked, this site\'s features will be displayed only on this site\'s Toolbar)', 'wp-symposium-toolbar' ) . '</span>';
                         echo '<br /><span class="description"> ' . __( 'Note: WPS features must be activated and correctly set up from the WPS Install page', 'wp-symposium-toolbar' ) . '</span><br />';
                     echo '</td>';

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

@@ -679 +679 @@
                 // New menu, if any
                 if ( isset( $_POST["new_custom_menu_slug"] ) && ( $_POST["new_custom_menu_slug"] != '' ) && isset( $_POST["new_custom_menu_location"] ) && ( $_POST["new_custom_menu_location"] != 'empty' ) ) {
-                    $display_custom_menu_icon = ( is_string( $_POST['display_custom_menu_icon'][$key] ) ) ? strip_tags( trim( $_POST['display_custom_menu_icon'][$key] ) ) : "";
+                    $display_custom_menu_icon = ( is_string( $_POST['new_custom_menu_icon'] ) ) ? strip_tags( trim( $_POST['new_custom_menu_icon'] ) ) : "";
                     $menu_icon = ( strstr( $display_custom_menu_icon, 'content: ' ) || filter_var( $display_custom_menu_icon, FILTER_VALIDATE_URL ) ) ? $display_custom_menu_icon : "";
                     $all_custom_menus[] = array(
@@ -689 +689 @@
                         isset( $_POST['new_custom_menu_responsive'] )
                     );
+                    if ( !isset( $key) ) { $key = 0; } else { $key = $key + 1; }
                     if ( strstr( $menu_icon, 'content: ' ) ) $all_custom_icons .= '#wpadminbar li.wpst-custom-item-'.$key.' > .ab-item:before { font-family: dashicons !important; '.$menu_icon.'; display: block; } ';
                     if ( $display_custom_menu_icon != $menu_icon ) $wpst_failed .= $_POST['display_custom_menu_slug'][$key].', '.$_POST['display_custom_menu_location'][$key].__( ': custom icon format not recognized', 'wp-symposium-toolbar' ).'<br />';

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

@@ -273 +273 @@
     
     // If Multisite and network activated, add network menus to custom menus
-    if ( is_multisite() && is_plugin_active_for_network( 'wp-symposium-toolbar/wp-symposium-toolbar.php' ) ) {
+    if ( is_multisite() && !is_main_site() && is_plugin_active_for_network( 'wp-symposium-toolbar/wp-symposium-toolbar.php' ) ) {
         $all_network_menus = get_option( 'wpst_tech_network_menus', array() );
         if ( $all_network_menus != array() ) {