Changeset 494274

Timestamp:

01/23/2012 10:39:46 PM (14 years ago)

Author:

Bueltge

Message:

Update trunk for fix menu-items with entities

Location:

adminimize/trunk

Files:

• adminimize.php (modified) (4 diffs)
• inc-options/menu_options.php (modified) (6 diffs)

adminimize/trunk/adminimize.php

@@ -13 +13 @@
  * Author:      Frank Bültge
  * Author URI:  http://bueltge.de/
- * Version:     1.7.24
+ * Version:     1.7.25
  * License:     GPLv3
  */
@@ -417 +417 @@
 
     add_action( 'in_admin_footer', '_mw_adminimize_admin_footer' );
-
+    
     $adminimizeoptions['mw_adminimize_default_menu'] = $menu;
     $adminimizeoptions['mw_adminimize_default_submenu'] = $submenu;
@@ -1435 +1435 @@
     $args = array( 'public' => TRUE, '_builtin' => FALSE );
     $post_types = get_post_types( $args );
-            
+    
     if ( isset( $_POST['_mw_adminimize_user_info'] ) ) {
         $adminimizeoptions['_mw_adminimize_user_info'] = strip_tags(stripslashes( $_POST['_mw_adminimize_user_info'] ) );
@@ -1533 +1533 @@
             $adminimizeoptions['mw_adminimize_disabled_menu_' . $role . '_items'] = array();
         }
-
+        
         if ( isset( $_POST['mw_adminimize_disabled_submenu_' . $role . '_items'] ) ) {
             $adminimizeoptions['mw_adminimize_disabled_submenu_' . $role . '_items']  = $_POST['mw_adminimize_disabled_submenu_' . $role . '_items'];

adminimize/trunk/inc-options/menu_options.php

@@ -34 +34 @@
                             $wp_submenu = _mw_adminimize_get_option_value('mw_adminimize_default_submenu');
                             
-                            if ( empty($wp_menu) ) {
+                            if ( ! isset($wp_menu) || empty($wp_menu) ) {
                                 global $menu;
                                 
                                 $wp_menu = $menu;
                             }
-                            if ( !isset($wp_submenu) ) {
+                            if ( ! isset($wp_submenu) || empty($wp_submenu) ) {
                                 global $submenu;
                                 
@@ -82 +82 @@
     
                                         echo '<tr class="form-invalid">' . "\n";
-                                        echo "\t" . '<th>' . $item[0] . ' <span style="color:#ccc; font-weight: 400;">(' . $item[2] . ')</span> </th>';
+                                        echo "\t" . '<th>' . $item[0] . ' <span style="color:#ccc; font-weight: 400;">(' . htmlentities( $item[2] ) . ')</span> </th>';
                                         foreach ($user_roles as $role) {
                                             if ( $role != 'administrator' ) { // only admin disable items
@@ -88 +88 @@
                                                 $disabled_item_adm_hint = '';
                                             }
-                                            echo "\t" . '<td class="num">' . $disabled_item_adm_hint . '<input id="check_menu'. $role . $x .'" type="checkbox"' . $disabled_item_adm . $checked_user_role_[$role] . ' name="mw_adminimize_disabled_menu_'. $role .'_items[]" value="' . $item[2] . '" />' . $disabled_item_adm_hint . '</td>' . "\n";
+                                            echo "\t" . '<td class="num">' . $disabled_item_adm_hint . '<input id="check_menu'. $role . $x .'" type="checkbox"' . $disabled_item_adm . $checked_user_role_[$role] . ' name="mw_adminimize_disabled_menu_'. $role .'_items[]" value="' . htmlentities( $item[2] ) . '" />' . $disabled_item_adm_hint . '</td>' . "\n";
                                         }
                                         echo '</tr>';
@@ -105 +105 @@
                                         $x++;
 
-                                        if ( !isset($wp_submenu[$item[2]]) )
+                                        if ( ! isset($wp_submenu[$item[2]]) )
                                             continue;
 
@@ -124 +124 @@
                                                     $checked_user_role_[$role]  = ( in_array($subitem[2], $disabled_submenu_[$role] ) ) ? ' checked="checked"' : '';
                                             }
-                                            echo '<td> &mdash; ' . $subitem[0] . ' <span style="color:#ccc; font-weight: 400;">(' . $subitem[2] . ')</span> </td>' . "\n";
+                                            echo '<td> &mdash; ' . $subitem[0] . ' <span style="color:#ccc; font-weight: 400;">(' . htmlentities( $subitem[2] ) . ')</span> </td>' . "\n";
                                             foreach ($user_roles as $role) {
                                                 if ( $role != 'administrator' ) { // only admin disable items
@@ -130 +130 @@
                                                     $disabled_subitem_adm_hint = '';
                                                 }
-                                                echo '<td class="num">' . $disabled_subitem_adm_hint . '<input id="check_menu'. $role.$x .'" type="checkbox"' . $disabled_subitem_adm . $checked_user_role_[$role] . ' name="mw_adminimize_disabled_submenu_'. $role .'_items[]" value="' . $subitem[2] . '" />' . $disabled_subitem_adm_hint . '</td>' . "\n";
+                                                echo '<td class="num">' . $disabled_subitem_adm_hint . '<input id="check_menu'. $role.$x .'" type="checkbox"' . $disabled_subitem_adm . $checked_user_role_[$role] . ' name="mw_adminimize_disabled_submenu_'. $role .'_items[]" value="' . htmlentities( $subitem[2] ) . '" />' . $disabled_subitem_adm_hint . '</td>' . "\n";
                                             }
                                             echo '</tr>' . "\n";