From f273de57f2e49a7f7daca58c26639dfbdf33f069 Mon Sep 17 00:00:00 2001
From: Mark Trapp <mark@marktrapp.com>
Date: Thu, 29 Aug 2013 00:55:56 -0700
Subject: [PATCH] Issue #2076691 by Mark Trapp: Arguments passed to
 me_handler() in the wrong order

---
 me.install | 7 +++++++
 me.module  | 9 ++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/me.install b/me.install
index 6e86dfc..9d1a9ec 100644
--- a/me.install
+++ b/me.install
@@ -37,4 +37,11 @@ function me_install() {
   ))
   ->condition('name', 'me')
   ->execute();
+}
+
+/**
+ * Rebuild menu registry.
+ */
+function me_update_7001() {
+  menu_rebuild();
 }
\ No newline at end of file
diff --git a/me.module b/me.module
index 4c2e848..88e31ab 100644
--- a/me.module
+++ b/me.module
@@ -316,9 +316,12 @@ function me_menu_alter(&$callbacks) {
         }
 
         $parts = explode('/', $new_path, MENU_MAX_PARTS);
-        //if (isset($data['page arguments'])) $data['page arguments'] = array_merge(array($parts, $data['page callback']), $data['page arguments']);
-        if (isset($data['page arguments'])) $data['page arguments'] = array_merge($data['page arguments'], array($data['page callback'], $parts));
-        else $data['page arguments'] = array($parts, $data['page callback']);
+        if (isset($data['page arguments'])) {
+          $data['page arguments'] = array_merge($data['page arguments'], array($data['page callback'], $parts));
+        }
+        else {
+          $data['page arguments'] = array($data['page callback'], $parts);
+        }
         $data['page callback'] = 'me_handler';
       }
 
-- 
1.8.3.4 (Apple Git-47)