follow simple menu maj

Signed-off-by: bachy <git@g-u-i.net>

LICENSE.txt

@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

simplemenu.info

@@ -11,3 +11,10 @@ configure = admin/config/simplemenu
 version = "7.x-1.x-dev"
 project = simplemenu
 datestamp = "1274876110"
+
+; Information added by drupal.org packaging script on 2011-11-10
+version = "7.x-1.x-dev"
+core = "7.x"
+project = "simplemenu"
+datestamp = "1320887030"
+

simplemenu.install

@@ -1,11 +1,34 @@
 <?php
 
 /**
- * Get rid of the variables used by simple menu.
+ * @file
+ * SimpleMenu module installation file.
+ */
+
+/**
+ * Implements hook_uninstall().
  */
 function simplemenu_uninstall() {
-  // XXX
-  //db_query("DELETE FROM {variable} WHERE name LIKE 'simplemenu_%'");
+  // Get rid of the variables used by simple menu.
+  variable_del('simplemenu_cache_menu');
+  variable_del('simplemenu_css_error');
+  variable_del('simplemenu_css_filename');
+  variable_del('simplemenu_detect_popup');
+  variable_del('simplemenu_dropdown_zindex');
+  variable_del('simplemenu_effect');
+  variable_del('simplemenu_effect_speed');
+  variable_del('simplemenu_element');
+  variable_del('simplemenu_element_method');
+  variable_del('simplemenu_exclusions');
+  variable_del('simplemenu_fix');
+  variable_del('simplemenu_hide_delay');
+  variable_del('simplemenu_menu');
+  variable_del('simplemenu_menu_scope');
+  variable_del('simplemenu_menubar_zindex');
+  variable_del('simplemenu_running');
+  variable_del('simplemenu_superfish_version');
+  variable_del('simplemenu_theme');
+  variable_del('simplemenu_uid1');
+  variable_del('simplemenu_visibility_operator');
+  variable_del('simplemenu_visibility_pages');
 }
-
-// vim: ts=2 sw=2 et syntax=php

simplemenu.module

@@ -6,18 +6,19 @@
  */
 
 /**
- * Implementation of hook_menu().
+ * Implements hook_menu().
  */
 function simplemenu_menu() {
   $items = array();
 
-  $items['admin/config/simplemenu'] = array(
+  $items['admin/config/user-interface/simplemenu'] = array(
     'title' => 'SimpleMenu',
     'description' => 'Select the menu to display.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('simplemenu_admin_settings'),
     'access arguments' => array('administer simplemenu'),
     'file' => 'simplemenu.admin.inc',
+    'type' => MENU_NORMAL_ITEM,
   );
 
   return $items;
@@ -27,22 +28,29 @@ function simplemenu_menu() {
  * Is simplemenu enabled for this page request?
  */
 function simplemenu_enabled() {
-  static $enabled;
+  $enabled = &drupal_static(__FUNCTION__);
 
   if (!isset($enabled)) {
     global $theme;
+    
+    $is_overlay = FALSE;
+    if (function_exists('overlay_get_mode')) {
+      $is_overlay = (overlay_get_mode() == 'child') ? TRUE : FALSE;
+    }
+    
     $exclusions = variable_get('simplemenu_exclusions', array());
     $enabled = (!isset($exclusions[$theme]) || !$exclusions[$theme])
       && user_access('view simplemenu')
       && _simplemenu_page_visibility()
-      && _simplemenu_superuser_active();
+      && _simplemenu_superuser_active()
+      && !$is_overlay;
   }
 
   return $enabled;
 }
 
 /**
- * Implementation of hook_init().
+ * Implements hook_init().
  */
 function simplemenu_init() {
   // do a simple access check here, since theme isn't available to check yet
@@ -124,11 +132,11 @@ function _simplemenu_add_css() {
       );
       switch ($fix) {
       case 'top':
-        $tags['@FIX@'] = "position: fixed;\n  top: 0;";
+        $tags['@FIX@'] = "position: fixed;\n  top: 0; left: 0;";
         break;
 
       case 'bottom':
-        $tags['@FIX@'] = "position: fixed;\n  bottom: 0;";
+        $tags['@FIX@'] = "position: fixed;\n  bottom: 0; left: 0;";
         break;
 
       default: // scroll
@@ -268,15 +276,17 @@ function simplemnu_get_zindex($name, $default) {
 }
 
 /**
- * Implementation of hook_permission().
+ * Implements hook_permission().
  */
 function simplemenu_permission() {
   return array(
     'view simplemenu' => array(
-      'title' => t('See and use the Simplemenu'),
+      'title' => t('View SimpleMenu'),
+      'description' => t('Display SimpleMenu to this user.'),
     ),
     'administer simplemenu' => array(
-      'title' => t('Administer the Simplemenu'),
+      'title' => t('Administer SimpleMenu'),
+      'description' => t('Change settings of SimpleMenu.'),
     ),
   );
 }
@@ -373,14 +383,16 @@ function simplemenu_tree_remove_hidden($tree) {
  * regardless of whether or not the menu item is expanded or not.
  */
 function simplemenu_menu_tree($menu_name = 'management:0') {
-  static $menu_tree = array();
+  $menu_tree = &drupal_static(__FUNCTION__, array());
+
+  // until we take $mlid in account, we can use $mname
+  // for the rest of the function
+  list($mname, $mlid) = explode(':', $menu_name);
 
-  if (!isset($menu_output[$menu_name])) {
-    //$menu_tree[$menu_name] = simplemenu_tree_all_data($menu_name);
-    list($mname, $mlid) = explode(':', $menu_name);
-    $menu_tree[$menu_name] = menu_tree_all_data($mname);
+  if (!isset($menu_tree[$mname])) {
+    $menu_tree[$mname] = menu_tree_all_data($mname);
   }
-  return $menu_tree[$menu_name];
+  return $menu_tree[$mname];
 }
 
 /**
@@ -393,66 +405,20 @@ function simplemenu_menu_tree($menu_name = 'management:0') {
  * @todo we don't actually need $menu_name, $mlid would be sufficient
  */
 function simplemenu_tree_all_data($root_menu = 'management:0') {
-  static $tree = array();
+  $tree = &drupal_static(__FUNCTION__, array());
 
   list($menu_name, $mlid) = explode(':', $root_menu);
 
   // Generate the cache ID for Drupal 7.
-  $cid = 'links:' . $menu_name . ':all-cid:' . $mlid . ':' . $GLOBALS['language']->language . ':0';
+  $max_depth = NULL;
+  $cid = 'links:' . $menu_name . ':all:' . $mlid . ':' . $GLOBALS['language']->language . ':' . (int) $max_depth;
 
   if (!isset($tree[$cid])) {
-    // // If the static variable doesn't have the data, check {cache_menu}.
-    // $cache = cache_get($cid, 'cache_menu');
-    // if ($cache && isset($cache->data)) {
-    //   $data = $cache->data;
-    // }
-    // else {
-    //   // Build and run the query, and build the tree.
-    //   $where = '';
-    //   $args = array(':menu_name' => $menu_name);
-
-    //   if ($mlid > 0) {
-    //     $item = menu_link_load($mlid);
-    //     if ($item) {
-    //       // The tree is a subtree of $menu_name, so we need to restrict the query to
-    //       // this subtree.
-    //       $px = "p" . (int) $item['depth'];
-    //       $where = " AND ml.$px = :ml AND ml.mlid != :mlid";
-    //       $args[':ml'] = $item[$px];
-    //       $args[':mlid'] = $mlid;
-    //     }
-    //   }
-    //   // Select the links from the table, and recursively build the tree.  We
-    //   // LEFT JOIN since there is no match in {menu_router} for an external
-    //   // link.
-    //   $result = db_query("SELECT m.load_functions, m.to_arg_functions, m.access_callback,
-    //                     m.access_arguments, m.page_callback, m.page_arguments,
-    //                     m.title, m.title_callback, m.title_arguments, m.type, m.description, ml.*
-    //     FROM {menu_links} ml LEFT JOIN {menu_router} m ON m.path = ml.router_path
-    //     WHERE ml.menu_name = :menu_name$where
-    //     ORDER BY p1 ASC, p2 ASC, p3 ASC, p4 ASC, p5 ASC, p6 ASC, p7 ASC, p8 ASC, p9 ASC", $args);
-    //   $data['tree'] = menu_tree_data($result->fetchAssoc());
-    //   $data['node_links'] = array();
-    //   menu_tree_collect_node_links($data['tree'], $data['node_links']);
-    //   // Cache the data.
-    //   cache_set($cid, $data, 'cache_menu');
-    // }
-    // // Check access for the current user to each item in the tree.
-    // menu_tree_check_access($data['tree'], $data['node_links']);
-    // $tree[$cid] = $data['tree'];
-
-    // If the static variable doesn't have the data, check {cache_menu}.
     $cache = cache_get($cid, 'cache_menu');
     if ($cache && isset($cache->data)) {
-      // If the cache entry exists, it will just be the cid for the actual data.
-      // This avoids duplication of large amounts of data.
-      $cache = cache_get($cache->data, 'cache_menu');
-      if ($cache && isset($cache->data)) {
-        $data = $cache->data;
-      }
+      $data = $cache->data;
     }
-    // If the tree data was not in the cache, $data will be NULL.
-    if (!isset($data)) {
+    else {
       // Build the query using a LEFT JOIN since there is no match in
       // {menu_router} for an external link.
       $query = db_select('menu_links', 'ml', array('fetch' => PDO::FETCH_ASSOC));
@@ -467,6 +433,8 @@ function simplemenu_tree_all_data($root_menu = 'management:0') {
         'page_callback',
         'page_arguments',
         'delivery_callback',
+        'tab_parent',
+        'tab_root',
         'title',
         'title_callback',
         'title_arguments',
@@ -479,44 +447,39 @@ function simplemenu_tree_all_data($root_menu = 'management:0') {
         $query->orderBy('p' . $i, 'ASC');
       }
       $query->condition('ml.menu_name', $menu_name);
-      if (isset($max_depth)) {
-        $query->condition('ml.depth', $max_depth, '<=');
-      }
-      if ($mlid) {
-        // The tree is for a single item, so we need to match the values in its
-        // p columns and 0 (the top level) with the plid values of other links.
-        $args = array(0);
-        for ($i = 1; $i < MENU_MAX_DEPTH; $i++) {
-          $args[] = $link["p$i"];
+      if ($mlid > 0) {
+        $item = menu_link_load($mlid);
+        if ($item) {
+          // The tree is a subtree of $menu_name, so we need to restrict the query to
+          // this subtree.
+          $px = "p" . (int) $item['depth'];
+          $and = db_and()->condition("ml.$px", $item[$px])->condition("ml.mlid", $mlid, '!=');
+          $query->condition($and);
         }
-        $args = array_unique($args);
-        $query->condition('ml.plid', $args, 'IN');
-        $parents = $args;
-        $parents[] = $link['mlid'];
       }
-      else {
-        // Get all links in this menu.
-        $parents = array();
-      }
-      // Select the links from the table, and build an ordered array of links
-      // using the query result object.
+
+      // Build an ordered array of links using the query result object.
       $links = array();
       foreach ($query->execute() as $item) {
         $links[] = $item;
       }
-      $data['tree'] = menu_tree_data($links, $parents);
+
+      $data['tree'] = menu_tree_data($links);
+      if (count($data['tree']) == 1) {
+        // Move the menu items from below to root
+        $key = key($data['tree']);
+        foreach ($data['tree'][$key]['below'] as $id => $item) {
+          $data['tree'][$id] = $item;
+          unset($data['tree'][$key]['below'][$id]);
+        }
+      }
+
       $data['node_links'] = array();
       menu_tree_collect_node_links($data['tree'], $data['node_links']);
-      // Cache the data, if it is not already in the cache.
-      $tree_cid = _menu_tree_cid($menu_name, $data);
-      if (!cache_get($tree_cid, 'cache_menu')) {
-        cache_set($tree_cid, $data, 'cache_menu');
-      }
-      // Cache the cid of the (shared) data using the menu and item-specific cid.
-      cache_set($cid, $tree_cid, 'cache_menu');
+      menu_tree_check_access($data['tree'], $data['node_links']);
+      cache_set($cid, $data, 'cache_menu');
     }
-    // Check access for the current user to each item in the tree.
-    menu_tree_check_access($data['tree'], $data['node_links']);
+
     $tree[$cid] = $data['tree'];
   }
 
@@ -558,5 +521,3 @@ function _simplemenu_superuser_active() {
   global $user;
   return $user->uid != 1 || variable_get('simplemenu_uid1', 1) == 1;
 }
-
-// vim: ts=2 sw=2 et syntax=php

simplemenu_devel.info

@@ -13,3 +13,10 @@ core = "7.x"
 project = "simplemenu"
 datestamp = "1274876110"
 
+
+; Information added by drupal.org packaging script on 2011-11-10
+version = "7.x-1.x-dev"
+core = "7.x"
+project = "simplemenu"
+datestamp = "1320887030"
+

simplemenu_devel.module

@@ -15,6 +15,7 @@ function simplemenu_devel_simplemenu_tree_alter(&$tree) {
         'mlid' => 0,
         'menu_name' => 'devel',
         'hidden' => FALSE,
+        'access' => TRUE,
         'title' => t('Devel module'),
         'href' => 'admin/settings/devel',
         'in_active_trail' => FALSE,

simplemenu_inactive_parents.info

@@ -12,3 +12,10 @@ core = "7.x"
 project = "simplemenu"
 datestamp = "1274876110"
 
+
+; Information added by drupal.org packaging script on 2011-11-10
+version = "7.x-1.x-dev"
+core = "7.x"
+project = "simplemenu"
+datestamp = "1320887030"
+

simplemenu_inactive_parents.module

@@ -9,7 +9,7 @@
  * \brief Alter the menu item link theme registry.
  *
  * This function grabs the simplemenu theme registry for the
- * menu_item_link theming. This gives us a way to remove the
+ * menu_link theming. This gives us a way to remove the
  * link and replace it with a name (anchor) instead.
  *
  * This is only applied to the Simplemenu as intefering with
@@ -26,11 +26,11 @@ function simplemenu_inactive_parents_theme_registry_alter(&$theme_registry) {
 
   // Save theme function
   $themes = variable_get('simplemenu_inactive_parents_theme_function', array());
-  $themes[$theme] = $theme_registry['menu_item_link']['function'];
+  $themes[$theme] = $theme_registry['menu_link']['function'];
   variable_set('simplemenu_inactive_parents_theme_function', $themes);
 
   // Replace with our own
-  $theme_registry['menu_item_link']['function'] = 'simplemenu_inactive_parents_theme_menu_item_link';
+  $theme_registry['menu_item_link']['function'] = 'simplemenu_inactive_parents_theme_menu_link';
 }
 
 /**
@@ -39,7 +39,7 @@ function simplemenu_inactive_parents_theme_registry_alter(&$theme_registry) {
  * This function intercepts the menu item link theming function of
  * the system and 
  */
-function simplemenu_inactive_parents_theme_menu_item_link($link) {
+function simplemenu_inactive_parents_theme_menu_link($link) {
   global $theme;
   static $cnt = 0;
 
@@ -57,7 +57,7 @@ function simplemenu_inactive_parents_theme_menu_item_link($link) {
 
   // somehow the preprocess function did not get called?!
   // use the core default
-  return theme_menu_item_link($link);
+  return theme_menu_link($link);
 }
 
 // vim: ts=2 sw=2 et syntax=php

simplemenu_multi_menu.info

@@ -17,3 +17,10 @@ core = "7.x"
 project = "simplemenu"
 datestamp = "1274876110"
 
+
+; Information added by drupal.org packaging script on 2011-11-10
+version = "7.x-1.x-dev"
+core = "7.x"
+project = "simplemenu"
+datestamp = "1320887030"
+