From 23fc2390f2ae23d88c19f4a42cd73cac3c111f38 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Mon, 20 Feb 2012 20:13:21 +0000
Subject: [PATCH] [gh-294] Merging from testing into staging -c 1454

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@1457 20a16fea-79d4-4915-8869-1ea9d5ebf173
---
 sites/all/modules/menu_block/CHANGELOG.txt    |  15 +
 sites/all/modules/menu_block/LICENSE.txt      | 601 ++++++++++--------
 .../modules/menu_block/menu_block.admin.inc   |  65 +-
 sites/all/modules/menu_block/menu_block.info  |  11 +-
 .../all/modules/menu_block/menu_block.install |   2 -
 .../all/modules/menu_block/menu_block.module  | 108 +++-
 .../menu_block/menu_block_export.admin.inc    |  27 -
 .../modules/menu_block/menu_block_export.info |   6 +-
 .../menu_block/menu_block_export.module       |  27 +-
 .../content_types/menu_tree/menu_tree.inc     |  14 +-
 10 files changed, 489 insertions(+), 387 deletions(-)

diff --git a/sites/all/modules/menu_block/CHANGELOG.txt b/sites/all/modules/menu_block/CHANGELOG.txt
index 8f5b93fb..942d1ebf 100644
--- a/sites/all/modules/menu_block/CHANGELOG.txt
+++ b/sites/all/modules/menu_block/CHANGELOG.txt
@@ -1,3 +1,18 @@
+Menu Block 7.x-2.3, 2012-02-04
+------------------------------
+- #1105372 by mikl, fabsor and JohnAlbin: Add menu tree ctools content type to D7
+- #1425342 by JohnAlbin and Dave Reid: Menu block fails with Drupal core 7.12; remove work-around for core bug #942782.
+- #1243978 by Dave Reid: Fixed menu_block_export_menu() items were not translatable since they were not located in menu_block_export.module.
+- #1243978 by Dave Reid: Fixed menu_block_menu() items were not translatable since they were not located in menu_block.module.
+- by Dave Reid: Moved menu_block_menu_alter() to menu_block.menu so that it doesn't cause a module hook cache miss.
+- #1155052 by Dave Reid: Fixed errors if block module is not enabled.
+- #1162038 by Dave Reid: Fixed 'Add menu block' local action only appears on default theme.
+- #1114722 by dropcube: Fixed i18n menu support
+- #1154122 by Dave Reid: Moved block module hook implementations to menu_block.module to prevent problems with hook implementation caching.
+- #1078806 by Dave Reid: Fixed string untranslated warning from coder.
+- #1139530 by Dave Reid: Add a base form ID of block_add_block_form to menu_block_add_block_form so other modules can properly and easily alter it.
+- #1139522 by Dave Reid: Fixed fatal error with current page menu trees.
+
 Menu Block 7.x-2.2, 2011-03-09
 ------------------------------
 - #1086376: Custom menu fix doesn't work for new installations
diff --git a/sites/all/modules/menu_block/LICENSE.txt b/sites/all/modules/menu_block/LICENSE.txt
index 2c095c8d..d159169d 100644
--- a/sites/all/modules/menu_block/LICENSE.txt
+++ b/sites/all/modules/menu_block/LICENSE.txt
@@ -1,274 +1,339 @@
-GNU GENERAL PUBLIC LICENSE
-
-              Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
-Cambridge, MA 02139, 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 Library 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.
+                    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.)
+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
+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
+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.
diff --git a/sites/all/modules/menu_block/menu_block.admin.inc b/sites/all/modules/menu_block/menu_block.admin.inc
index 0465e531..98f3bbb7 100644
--- a/sites/all/modules/menu_block/menu_block.admin.inc
+++ b/sites/all/modules/menu_block/menu_block.admin.inc
@@ -4,50 +4,6 @@
  * Provides infrequently used functions and hooks for menu_block.
  */
 
-/**
- * Implements hook_menu().
- */
-function _menu_block_menu() {
-  $items['admin/structure/block/add-menu-block'] = array(
-    'title' => 'Add menu block',
-    'description' => 'Add a new menu block.',
-    'access arguments' => array('administer blocks'),
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('menu_block_add_block_form'),
-    'type' => MENU_LOCAL_ACTION,
-    'file' => 'menu_block.admin.inc',
-  );
-  $items['admin/structure/block/delete-menu-block'] = array(
-    'title' => 'Delete menu block',
-    'access arguments' => array('administer blocks'),
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('menu_block_delete'),
-    'type' => MENU_CALLBACK,
-    'file' => 'menu_block.admin.inc',
-  );
-  $items['admin/config/user-interface/menu-block'] = array(
-    'title' => 'Menu block',
-    'description' => 'Configure menu block.',
-    'access arguments' => array('administer blocks'),
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('menu_block_admin_settings_form'),
-    'type' => MENU_NORMAL_ITEM,
-    'file' => 'menu_block.admin.inc',
-  );
-  return $items;
-}
-
-/**
- * Implements hook_menu_alter().
- */
-function menu_block_menu_alter(&$items) {
-  // Fake the necessary menu attributes necessary for a contextual link.
-  $items['admin/content/book/%node']['title'] = 'Edit book outline';
-  $items['admin/content/book/%node']['type'] = MENU_LOCAL_TASK;
-  $items['admin/content/book/%node']['context'] = (MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE);
-  $items['admin/content/book/%node']['tab_root'] = 'admin/content/book';
-}
-
 /**
  * Implements hook_theme().
  */
@@ -89,7 +45,18 @@ function _menu_block_ctools_plugin_directory($module, $plugin) {
  */
 function menu_block_add_block_form($form, &$form_state) {
   module_load_include('inc', 'block', 'block.admin');
-  return block_admin_configure($form, $form_state, 'menu_block', NULL);
+  $form = block_admin_configure($form, $form_state, 'menu_block', NULL);
+
+  // Other modules should be able to use hook_form_block_add_block_form_alter()
+  // to modify this form, so add a base form ID.
+  $form_state['build_info']['base_form_id'] = 'block_add_block_form';
+
+  // Prevent block_add_block_form_validate/submit() from being automatically
+  // added because of the base form ID by providing these handlers manually.
+  $form['#validate'] = array();
+  $form['#submit'] = array('menu_block_add_block_form_submit');
+
+  return $form;
 }
 
 /**
@@ -99,6 +66,7 @@ function menu_block_add_block_form_submit($form, &$form_state) {
   // Determine the delta of the new block.
   $block_ids = variable_get('menu_block_ids', array());
   $delta = empty($block_ids) ? 1 : max($block_ids) + 1;
+  $form_state['values']['delta'] = $delta;
 
   // Save the new array of blocks IDs.
   $block_ids[] = $delta;
@@ -541,14 +509,11 @@ function menu_block_admin_settings_form($form, &$form_state) {
     '#title' => t('Suppress Drupal’s standard menu blocks'),
     '#default_value' => variable_get('menu_block_suppress_core', 0),
     '#description' => t('On the blocks admin page, hide Drupal’s standard blocks of menus.'),
+    '#access' => module_exists('block'),
   );
 
   // Retrieve core's menus.
   $menus = menu_get_menus();
-  // Include book support.
-  if (module_exists('book')) {
-    module_load_include('inc', 'menu_block', 'menu_block.book');
-  }
   // Retrieve all the menu names provided by hook_menu_block_get_sort_menus().
   $menus = array_merge($menus, module_invoke_all('menu_block_get_sort_menus'));
   asort($menus);
@@ -633,7 +598,7 @@ function menu_block_admin_settings_form_submit($form, &$form_state) {
   else {
     variable_del('menu_block_suppress_core');
   }
-  drupal_set_message('The configuration options have been saved.');
+  drupal_set_message(t('The configuration options have been saved.'));
 }
 
 /**
diff --git a/sites/all/modules/menu_block/menu_block.info b/sites/all/modules/menu_block/menu_block.info
index 8ac69930..91ef56a8 100644
--- a/sites/all/modules/menu_block/menu_block.info
+++ b/sites/all/modules/menu_block/menu_block.info
@@ -2,22 +2,21 @@ name = "Menu Block"
 description = "Provides configurable blocks of menu items."
 
 core = 7.x
-dependencies[] = menu
+dependencies[] = menu (>7.11)
 
 files[] = menu_block.module
 files[] = menu_block.admin.inc
-files[] = menu_block.book.inc
 files[] = menu_block.follow.inc
 files[] = menu_block.pages.inc
 files[] = menu_block.sort.inc
 files[] = menu_block.install
-# files[] = plugins/content_types/menu_tree/menu_tree.inc
+files[] = plugins/content_types/menu_tree/menu_tree.inc
 
 configure = admin/config/user-interface/menu-block
 
-; Information added by drupal.org packaging script on 2011-03-09
-version = "7.x-2.2"
+; Information added by drupal.org packaging script on 2012-02-03
+version = "7.x-2.3"
 core = "7.x"
 project = "menu_block"
-datestamp = "1299683174"
+datestamp = "1328286646"
 
diff --git a/sites/all/modules/menu_block/menu_block.install b/sites/all/modules/menu_block/menu_block.install
index 5d5ab940..81324651 100644
--- a/sites/all/modules/menu_block/menu_block.install
+++ b/sites/all/modules/menu_block/menu_block.install
@@ -37,8 +37,6 @@ function menu_block_uninstall() {
  */
 function menu_block_enable() {
   drupal_set_message(t('To use menu blocks, find the "Add menu block" link on the <a href="@url">administer blocks page</a>.', array('@url' => url('admin/structure/block'))));
-  // @TODO Remove this when after this core bug is fixed: #942782.
-  menu_block_fix_custom_menus();
 }
 
 /**
diff --git a/sites/all/modules/menu_block/menu_block.module b/sites/all/modules/menu_block/menu_block.module
index 68402c04..83cf0c98 100644
--- a/sites/all/modules/menu_block/menu_block.module
+++ b/sites/all/modules/menu_block/menu_block.module
@@ -4,19 +4,12 @@
  * Provides configurable blocks of menu items.
  */
 
-// A core bug in Drupal 7.0 requires this fix.
-module_load_include('inc', 'menu_block', 'custom_menu_active_trail');
-
 /**
  * Denotes that the tree should use the menu picked by the curent page.
  */
 define('MENU_TREE__CURRENT_PAGE_MENU', '_active');
 
 // Off-load the following infrequently called hooks to another file.
-function menu_block_menu() {
-  module_load_include('inc', 'menu_block', 'menu_block.admin');
-  return _menu_block_menu();
-}
 function menu_block_theme(&$existing, $type, $theme, $path) {
   module_load_include('inc', 'menu_block', 'menu_block.admin');
   return _menu_block_theme($existing, $type, $theme, $path);
@@ -37,13 +30,72 @@ function menu_block_form_block_admin_display_form_alter(&$form, $form_state) {
   module_load_include('inc', 'menu_block', 'menu_block.admin');
   return _menu_block_form_block_admin_display_form_alter($form, $form_state);
 }
-/* -- temporarily remove until ctools is ported to D7.
 function menu_block_ctools_plugin_directory($module, $plugin) {
   module_load_include('inc', 'menu_block', 'menu_block.admin');
   return _menu_block_ctools_plugin_directory($module, $plugin);
 }
-*/
 
+/**
+ * Implements hook_menu().
+ */
+function menu_block_menu() {
+  // @todo Remove this check if block module is re-added as a dependency.
+  if (module_exists('block')) {
+    $items['admin/structure/block/add-menu-block'] = array(
+      'title' => 'Add menu block',
+      'description' => 'Add a new menu block.',
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('menu_block_add_block_form'),
+      'access arguments' => array('administer blocks'),
+      'type' => MENU_LOCAL_ACTION,
+      'file' => 'menu_block.admin.inc',
+    );
+    $default_theme = variable_get('theme_default', 'bartik');
+    foreach (list_themes() as $key => $theme) {
+      if ($key != $default_theme) {
+        $items['admin/structure/block/list/' . $key . '/add-menu-block'] = array(
+          'title' => 'Add menu block',
+          'description' => 'Add a new menu block.',
+          'page callback' => 'drupal_get_form',
+          'page arguments' => array('menu_block_add_block_form'),
+          'access arguments' => array('administer blocks'),
+          'type' => MENU_LOCAL_ACTION,
+          'file' => 'menu_block.admin.inc',
+        );
+      }
+    }
+    $items['admin/structure/block/delete-menu-block'] = array(
+      'title' => 'Delete menu block',
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('menu_block_delete'),
+      'access arguments' => array('administer blocks'),
+      'type' => MENU_CALLBACK,
+      'file' => 'menu_block.admin.inc',
+    );
+  }
+
+  $items['admin/config/user-interface/menu-block'] = array(
+    'title' => 'Menu block',
+    'description' => 'Configure menu block.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('menu_block_admin_settings_form'),
+    'access arguments' => array('administer blocks'),
+    'type' => MENU_NORMAL_ITEM,
+    'file' => 'menu_block.admin.inc',
+  );
+  return $items;
+}
+
+/**
+ * Implements hook_menu_alter().
+ */
+function menu_block_menu_alter(&$items) {
+  // Fake the necessary menu attributes necessary for a contextual link.
+  $items['admin/content/book/%node']['title'] = 'Edit book outline';
+  $items['admin/content/book/%node']['type'] = MENU_LOCAL_TASK;
+  $items['admin/content/book/%node']['context'] = (MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE);
+  $items['admin/content/book/%node']['tab_root'] = 'admin/content/book';
+}
 
 /**
  * Implements hook_help().
@@ -108,10 +160,6 @@ function menu_block_get_all_menus() {
     else {
       // Retrieve core's menus.
       $all_menus = menu_get_menus();
-      // Include book support.
-      if (module_exists('book')) {
-        module_load_include('inc', 'menu_block', 'menu_block.book');
-      }
       // Retrieve all the menu names provided by hook_menu_block_get_menus().
       $all_menus = array_merge($all_menus, module_invoke_all('menu_block_get_menus'));
       // Add an option to use the menu for the active menu item.
@@ -228,11 +276,11 @@ function menu_tree_build($config) {
       else {
         // Check if the menu matches one of the available patterns.
         foreach (array_keys($patterns) as $pattern) {
-          if (preg_match($pattern, $item['menu_name'])) {
+          if (preg_match($pattern, $item->menu_name)) {
             // Mark the menu.
             $menu_order[$pattern] = MENU_TREE__CURRENT_PAGE_MENU;
             // Store the actual menu name.
-            $patterns[$pattern] = $item['menu_name'];
+            $patterns[$pattern] = $item->menu_name;
           }
         }
       }
@@ -255,9 +303,6 @@ function menu_tree_build($config) {
   $menu_names = menu_block_get_all_menus();
   menu_block_set_title(t($menu_names[$config['menu_name']]));
 
-  // @TODO: Remove work-around for core bug #942782.
-  __menu_block_set_menu_trail($config['menu_name']);
-
   if ($config['expanded'] || $config['parent_mlid']) {
     // Get the full, un-pruned tree.
     $tree = menu_tree_all_data($config['menu_name']);
@@ -269,15 +314,12 @@ function menu_tree_build($config) {
     $tree = menu_tree_page_data($config['menu_name']);
   }
 
-  // @TODO: Remove work-around for core bug #942782.
-  __menu_block_set_menu_trail();
-
   // Allow alteration of the tree and config before we begin operations on it.
   drupal_alter('menu_block_tree', $tree, $config);
 
   // Localize the tree.
-  if (module_exists('i18nmenu')) {
-    i18nmenu_localize_tree($tree);
+  if (module_exists('i18n_menu')) {
+    $tree = i18n_menu_localize_tree($tree);
   }
 
   // Prune the tree along the active trail to the specified level.
@@ -673,3 +715,23 @@ function menu_block_tree_output(&$tree, $config = array()) {
 
   return $build;
 }
+
+/**
+ * Implements hook_menu_block_get_menus() on behalf of book.module.
+ */
+function book_menu_block_get_menus() {
+  $menus = array();
+  foreach (book_get_books() AS $book) {
+    $menus[$book['menu_name']] = $book['title'];
+  }
+  return $menus;
+}
+
+/**
+ * Implements hook_menu_block_get_sort_menus() on behalf of book.module.
+ */
+function book_menu_block_get_sort_menus() {
+  return array(
+    '/^book\-toc\-.+/' => t('Book navigation'),
+  );
+}
diff --git a/sites/all/modules/menu_block/menu_block_export.admin.inc b/sites/all/modules/menu_block/menu_block_export.admin.inc
index 48ade57b..4781da15 100644
--- a/sites/all/modules/menu_block/menu_block_export.admin.inc
+++ b/sites/all/modules/menu_block/menu_block_export.admin.inc
@@ -5,33 +5,6 @@
  * Provides infrequently used functions and hooks for menu_block_export.
  */
 
-/**
- * Implements hook_menu().
- */
-function _menu_block_export_menu() {
-  $items['admin/config/user-interface/menu-block/config'] = array(
-    'title' => 'Configure',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-  );
-  $items['admin/config/user-interface/menu-block/export'] = array(
-    'title' => 'export',
-    'description' => 'Export menu blocks.',
-    'access arguments' => array('administer blocks'),
-    'page callback' => 'menu_block_export_export',
-    'type' => MENU_LOCAL_TASK,
-    'file' => 'menu_block_export.admin.inc',
-  );
-  $items['admin/config/user-interface/menu-block/export/results'] = array(
-    'title' => 'Menu block bulk export results',
-    'description' => 'Exported menu blocks.',
-    'access arguments' => array('administer blocks'),
-    'page callback' => 'menu_block_export_export',
-    'type' => MENU_CALLBACK,
-    'file' => 'menu_block_export.admin.inc',
-  );
-  return $items;
-}
-
 /**
  * Page callback to export menu blocks in bulk.
  */
diff --git a/sites/all/modules/menu_block/menu_block_export.info b/sites/all/modules/menu_block/menu_block_export.info
index d9e5afbd..89a1ace5 100644
--- a/sites/all/modules/menu_block/menu_block_export.info
+++ b/sites/all/modules/menu_block/menu_block_export.info
@@ -10,9 +10,9 @@ files[] = menu_block_export.admin.inc
 
 configure = admin/config/user-interface/menu-block/export
 
-; Information added by drupal.org packaging script on 2011-03-09
-version = "7.x-2.2"
+; Information added by drupal.org packaging script on 2012-02-03
+version = "7.x-2.3"
 core = "7.x"
 project = "menu_block"
-datestamp = "1299683174"
+datestamp = "1328286646"
 
diff --git a/sites/all/modules/menu_block/menu_block_export.module b/sites/all/modules/menu_block/menu_block_export.module
index 4dc0f4a6..04dc02ba 100644
--- a/sites/all/modules/menu_block/menu_block_export.module
+++ b/sites/all/modules/menu_block/menu_block_export.module
@@ -5,8 +5,29 @@
  * Provides export interface for Menu block.
  */
 
-// Off-load the following infrequently called hooks to another file.
+/**
+ * Implements hook_menu().
+ */
 function menu_block_export_menu() {
-  module_load_include('inc', 'menu_block_export', 'menu_block_export.admin');
-  return _menu_block_export_menu();
+  $items['admin/config/user-interface/menu-block/config'] = array(
+    'title' => 'Configure',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+  );
+  $items['admin/config/user-interface/menu-block/export'] = array(
+    'title' => 'export',
+    'description' => 'Export menu blocks.',
+    'access arguments' => array('administer blocks'),
+    'page callback' => 'menu_block_export_export',
+    'type' => MENU_LOCAL_TASK,
+    'file' => 'menu_block_export.admin.inc',
+  );
+  $items['admin/config/user-interface/menu-block/export/results'] = array(
+    'title' => 'Menu block bulk export results',
+    'description' => 'Exported menu blocks.',
+    'access arguments' => array('administer blocks'),
+    'page callback' => 'menu_block_export_export',
+    'type' => MENU_CALLBACK,
+    'file' => 'menu_block_export.admin.inc',
+  );
+  return $items;
 }
diff --git a/sites/all/modules/menu_block/plugins/content_types/menu_tree/menu_tree.inc b/sites/all/modules/menu_block/plugins/content_types/menu_tree/menu_tree.inc
index 8572ed71..024846a3 100644
--- a/sites/all/modules/menu_block/plugins/content_types/menu_tree/menu_tree.inc
+++ b/sites/all/modules/menu_block/plugins/content_types/menu_tree/menu_tree.inc
@@ -97,7 +97,7 @@ function menu_block_menu_tree_content_type_render($subtype, $conf, $args, $conte
 /**
  * 'Edit form' callback for the content type.
  */
-function menu_block_menu_tree_content_type_edit_form(&$form, &$form_state) {
+function menu_block_menu_tree_content_type_edit_form($form, &$form_state) {
   $conf = $form_state['conf'];
 
   // Load the standard config form.
@@ -106,16 +106,20 @@ function menu_block_menu_tree_content_type_edit_form(&$form, &$form_state) {
   $sub_form_state = array('values' => $conf);
   $form += menu_block_configure_form($form, $sub_form_state);
 
+  // Hide the menu selector.
+  $form['menu_name']['#type'] = 'hidden';
+
   // Set the options to a simple list of menu links for the configured menu.
   $menus = menu_block_get_all_menus();
-  $form['parent']['#options'] = menu_parent_options(array($conf['menu_name'] => $menus[$conf['menu_name']]), array('mlid' => 0));
+  $form['parent_mlid']['#options'] = menu_parent_options(array($conf['menu_name'] => $menus[$conf['menu_name']]), array('mlid' => 0));
   // Hide the Parent item option for the special "active" menu.
   if ($conf['menu_name'] == MENU_TREE__CURRENT_PAGE_MENU) {
-    $form['parent']['#type'] = 'hidden';
-    $form['admin_title']['#suffix'] = '<div id="edit-parent-wrapper"><strong>' . t('Parent item:') . '</strong><br />' . t('<em>The menu selected by the page</em> can be customized on the <a href="!url">Menu block settings page</a>.', array('!url' => url('admin/config/user-interface/menu-block'))) . '</div>';
+    $form['parent_mlid']['#type'] = 'hidden';
   }
   // Remove CSS class hooks for jQuery script on parent select.
-  unset($form['parent']['#attributes']);
+  unset($form['parent_mlid']['#attributes']);
+
+  return $form;
 }
 
 /**
-- 
GitLab