Update to Drupal 7.94. For more information, see https://www.drupal.o…

…rg/project/drupal/releases/7.94
pantheon-systems · Dec 14, 2022 · 4f7b51f · 4f7b51f
1 parent df2703b
commit 4f7b51f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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']);
   }
 }