1 files changed, 7 insertions, 7 deletions

diff --git a/modules/book/book.module b/modules/book/book.module
index 9d3284bc8..1351fb625 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -370,12 +370,12 @@ function book_get_books() {
 
     if ($nids) {
       $query = db_select('book', 'b', array('fetch' => PDO::FETCH_ASSOC));
-      $node_alias = $query->join('node', 'n', 'b.nid = n.nid');
-      $menu_links_alias = $query->join('menu_links', 'ml', 'b.mlid = ml.mlid');
+      $query->join('node', 'n', 'b.nid = n.nid');
+      $query->join('menu_links', 'ml', 'b.mlid = ml.mlid');
       $query->addField('n', 'type', 'type');
       $query->addField('n', 'title', 'title');
       $query->fields('b');
-      $query->fields($menu_links_alias);
+      $query->fields('ml');
       $query->condition('n.nid', $nids, 'IN');
       $query->condition('n.status', 1);
       $query->orderBy('ml.weight');
@@ -1268,10 +1268,10 @@ function book_menu_subtree_data($link) {
     // If the subtree data was not in the cache, $data will be NULL.
     if (!isset($data)) {
       $query = db_select('menu_links', 'ml', array('fetch' => PDO::FETCH_ASSOC));
-      $menu_router_alias = $query->join('menu_router', 'm', 'm.path = ml.router_path');
-      $book_alias = $query->join('book', 'b', 'ml.mlid = b.mlid');
-      $query->fields($book_alias);
-      $query->fields($menu_router_alias, array('load_functions', 'to_arg_functions', 'access_callback', 'access_arguments', 'page_callback', 'page_arguments', 'delivery_callback', 'title', 'title_callback', 'title_arguments', 'type'));
+      $query->join('menu_router', 'm', 'm.path = ml.router_path');
+      $query->join('book', 'b', 'ml.mlid = b.mlid');
+      $query->fields('b');
+      $query->fields('m', array('load_functions', 'to_arg_functions', 'access_callback', 'access_arguments', 'page_callback', 'page_arguments', 'delivery_callback', 'title', 'title_callback', 'title_arguments', 'type'));
       $query->fields('ml');
       $query->condition('menu_name', $link['menu_name']);
       for ($i = 1; $i <= MENU_MAX_DEPTH && $link["p$i"]; ++$i) {