From 4f7b51ff2bb2fb013932713b2ac078766510708a Mon Sep 17 00:00:00 2001 From: Pantheon Automation Date: Wed, 14 Dec 2022 17:05:58 +0000 Subject: [PATCH] Update to Drupal 7.94. For more information, see https://www.drupal.org/project/drupal/releases/7.94 --- CHANGELOG.txt | 4 ++++ includes/bootstrap.inc | 2 +- includes/database/select.inc | 4 ++-- modules/book/book.module | 15 ++++++--------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index fe388ab81f7..2844995d6ac 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,7 @@ +Drupal 7.94, 2022-12-14 +----------------------- +- Hotfix for book.module and Select query properties + Drupal 7.93, 2022-12-07 ----------------------- - Improved support for PHP 8.2 diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 04834f2d2f3..d7435715d9c 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -8,7 +8,7 @@ /** * The current system version. */ -define('VERSION', '7.93'); +define('VERSION', '7.94'); /** * Core API compatibility. diff --git a/includes/database/select.inc b/includes/database/select.inc index e87da86b49a..cabb242df2b 100644 --- a/includes/database/select.inc +++ b/includes/database/select.inc @@ -949,14 +949,14 @@ class SelectQuery extends Query implements SelectQueryInterface { * * @var array */ - protected $alterMetaData; + public $alterMetaData; /** * The query tags. * * @var array */ - protected $alterTags; + public $alterTags; /** * An array whose elements specify a query to UNION, and the UNION type. The diff --git a/modules/book/book.module b/modules/book/book.module index d47a283065d..32047f93f55 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -872,15 +872,12 @@ function book_menu_name($bid) { * Implements hook_node_load(). */ function book_node_load($nodes, $types) { - $allowed = variable_get('book_allowed_types', array('book')); - if (array_intersect($types, $allowed)) { - $result = db_query("SELECT * FROM {book} b INNER JOIN {menu_links} ml ON b.mlid = ml.mlid WHERE b.nid IN (:nids)", array(':nids' => array_keys($nodes)), array('fetch' => PDO::FETCH_ASSOC)); - foreach ($result as $record) { - $nodes[$record['nid']]->book = $record; - $nodes[$record['nid']]->book['href'] = $record['link_path']; - $nodes[$record['nid']]->book['title'] = $record['link_title']; - $nodes[$record['nid']]->book['options'] = unserialize($record['options']); - } + $result = db_query("SELECT * FROM {book} b INNER JOIN {menu_links} ml ON b.mlid = ml.mlid WHERE b.nid IN (:nids)", array(':nids' => array_keys($nodes)), array('fetch' => PDO::FETCH_ASSOC)); + foreach ($result as $record) { + $nodes[$record['nid']]->book = $record; + $nodes[$record['nid']]->book['href'] = $record['link_path']; + $nodes[$record['nid']]->book['title'] = $record['link_title']; + $nodes[$record['nid']]->book['options'] = unserialize($record['options']); } }