2925449-67-tweaks.patch

interdiff.patch

diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index d53d3732be..3d7b4e97d5 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -3776,7 +3776,7 @@ function _drupal_shutdown_function() {
   chdir(DRUPAL_ROOT);
 
   try {
-    foreach ($callbacks as &$callback) {
+    foreach ($callbacks as $callback) {
       call_user_func_array($callback['callback'], $callback['arguments']);
     }
   }
diff --git a/includes/menu.inc b/includes/menu.inc
index d3324c9032..2735591a82 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -576,7 +576,6 @@ function _menu_load_objects(&$item, &$map) {
           // 'load arguments' in the hook_menu() entry, but they need
           // some processing. In this case the $function is the key to the
           // load_function array, and the value is the list of arguments.
-          reset($function);
           $args = current($function);
           $function = key($function);
           $load_functions[$index] = $function;
diff --git a/modules/book/book.module b/modules/book/book.module
index 32047f93f5..12580ef5b6 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -768,7 +768,6 @@ function book_prev($book_link) {
     return NULL;
   }
   $flat = book_get_flat_menu($book_link);
-  reset($flat);
   $curr = NULL;
   do {
     $prev = $curr;
@@ -808,7 +807,6 @@ function book_prev($book_link) {
  */
 function book_next($book_link) {
   $flat = book_get_flat_menu($book_link);
-  reset($flat);
   do {
     $key = key($flat);
     next($flat);