summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvica Puljic2012-10-05 07:20:47 (GMT)
committer Ivica Puljic2012-10-05 07:20:47 (GMT)
commit875136af63fe3884b6b652d305f6fdf2d25d4c48 (patch)
treede9d61c8874b1a7aba86d8ce3d984c834fa2b19d
parentbc1b5879d7a40c74b8629fb215b9101f6fa335da (diff)
Issue #1785676 by pivica: Properly include files in form alter.
-rw-r--r--CHANGELOG.txt4
-rw-r--r--menu_tag.module14
2 files changed, 9 insertions, 9 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9a50c72..cda4e8e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+Menu Tag 7.x-1.x-dev
+--------------------
+- Issue #1785676 by pivica: Properly include files in form alter.
+
Menu Tag 7.x-1.0 2012-07-31
---------------------------
- First stable release, no new features added since the last dev release. \ No newline at end of file
diff --git a/menu_tag.module b/menu_tag.module
index 4869b49..b226753 100644
--- a/menu_tag.module
+++ b/menu_tag.module
@@ -66,7 +66,7 @@ function menu_tag_block_view_alter(&$data, $block) {
* @see menu_tag_menu_item_form_submit()
*/
function menu_tag_form_menu_edit_item_alter(&$form, $form_state) {
- module_load_include('inc', 'menu_tag', 'menu_tag.forms');
+ form_load_include($form_state, 'inc', 'menu_tag', 'menu_tag.forms');
menu_tag_menu_item_form_alter($form);
}
@@ -79,7 +79,7 @@ function menu_tag_form_menu_edit_item_alter(&$form, $form_state) {
*/
function menu_tag_form_node_form_alter(&$form, $form_state) {
if (isset($form['menu'])) {
- module_load_include('inc', 'menu_tag', 'menu_tag.forms');
+ form_load_include($form_state, 'inc', 'menu_tag', 'menu_tag.forms');
menu_tag_menu_item_node_form_alter($form);
}
}
@@ -90,7 +90,7 @@ function menu_tag_form_node_form_alter(&$form, $form_state) {
* Adds menu tag option to the node's edit menu item form.
*/
function menu_tag_form_menu_overview_form_alter(&$form, $form_state) {
- module_load_include('inc', 'menu_tag', 'menu_tag.forms');
+ form_load_include($form_state, 'inc', 'menu_tag', 'menu_tag.forms');
menu_tag_menu_overview_form_alter($form);
}
@@ -101,7 +101,7 @@ function menu_tag_form_menu_overview_form_alter(&$form, $form_state) {
* menu tags to use for main and secondary menu.
*/
function menu_tag_form_menu_configure_alter(&$form, $form_state) {
- module_load_include('inc', 'menu_tag', 'menu_tag.forms');
+ form_load_include($form_state, 'inc', 'menu_tag', 'menu_tag.forms');
menu_tag_menu_configure_form_alter($form);
}
@@ -113,7 +113,7 @@ function menu_tag_form_alter(&$form, $form_state) {
&& ($form['module']['#value'] == 'menu'
|| $form['module']['#value'] == 'menu_block')
) {
- module_load_include('inc', 'menu_tag', 'menu_tag.forms');
+ form_load_include($form_state, 'inc', 'menu_tag', 'menu_tag.forms');
menu_tag_menu_block_form_alter($form);
}
}
@@ -182,7 +182,3 @@ function menu_tag_preprocess_page(&$vars) {
$vars['secondary_menu'] = theme_get_setting('toggle_secondary_menu') ? menu_tag_secondary_menu() : array();
}
}
-
-/* Helpers */
-
-