diff options
| -rw-r--r-- | includes/menu.inc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/includes/menu.inc b/includes/menu.inc index 729a202b8..da2f8a28a 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -505,6 +505,12 @@ function menu_rebuild() { foreach ($menu['items'] as $mid => $item) { if ($mid < 0 && ($item['type'] & MENU_MODIFIABLE_BY_ADMIN)) { $new_mid = db_next_id('{menu}_mid'); + // Check explicitly for mid 1. If the database was improperly prefixed, + // this would cause a nasty infinite loop. + // TODO: have automatic prefixing through an installer to prevent this. + if ($new_mid == 1) { + $new_mid = db_next_id('{menu}_mid'); + } if (isset($new_items[$item['pid']])) { $new_pid = $new_items[$item['pid']]['mid']; } |