Commit 83228839 authored by Dries's avatar Dries

- Patch #480412 by JamesAn: converted to drupal_static().

parent eb0839b9
...@@ -294,7 +294,7 @@ function theme_book_title_link($link) { ...@@ -294,7 +294,7 @@ function theme_book_title_link($link) {
* the options for a form select. * the options for a form select.
*/ */
function book_get_books() { function book_get_books() {
static $all_books; $all_books = &drupal_static(__FUNCTION__);
if (!isset($all_books)) { if (!isset($all_books)) {
$all_books = array(); $all_books = array();
...@@ -580,7 +580,7 @@ function book_update_bid($book_link) { ...@@ -580,7 +580,7 @@ function book_update_bid($book_link) {
* immediately after it in the array. * immediately after it in the array.
*/ */
function book_get_flat_menu($book_link) { function book_get_flat_menu($book_link) {
static $flat = array(); $flat = &drupal_static(__FUNCTION__, array());
if (!isset($flat[$book_link['mlid']])) { if (!isset($flat[$book_link['mlid']])) {
// Call menu_tree_all_data() to take advantage of the menu system's caching. // Call menu_tree_all_data() to take advantage of the menu system's caching.
...@@ -1144,7 +1144,7 @@ function book_link_load($mlid) { ...@@ -1144,7 +1144,7 @@ function book_link_load($mlid) {
* An subtree of menu links in an array, in the order they should be rendered. * An subtree of menu links in an array, in the order they should be rendered.
*/ */
function book_menu_subtree_data($item) { function book_menu_subtree_data($item) {
static $tree = array(); $tree = &drupal_static(__FUNCTION__, array());
// Generate a cache ID (cid) specific for this $menu_name and $item. // Generate a cache ID (cid) specific for this $menu_name and $item.
$cid = 'links:' . $item['menu_name'] . ':subtree-cid:' . $item['mlid']; $cid = 'links:' . $item['menu_name'] . ':subtree-cid:' . $item['mlid'];
......
...@@ -95,6 +95,8 @@ class BookTestCase extends DrupalWebTestCase { ...@@ -95,6 +95,8 @@ class BookTestCase extends DrupalWebTestCase {
* The nodes that should be displayed in the breadcrumb. * The nodes that should be displayed in the breadcrumb.
*/ */
function checkBookNode($node, $nodes, $previous = FALSE, $up = FALSE, $next = FALSE, array $breadcrumb) { function checkBookNode($node, $nodes, $previous = FALSE, $up = FALSE, $next = FALSE, array $breadcrumb) {
// $number does not use drupal_static as it should not be reset
// since it uniquely identifies each call to checkBookNode().
static $number = 0; static $number = 0;
$this->drupalGet('node/' . $node->nid); $this->drupalGet('node/' . $node->nid);
...@@ -166,6 +168,8 @@ class BookTestCase extends DrupalWebTestCase { ...@@ -166,6 +168,8 @@ class BookTestCase extends DrupalWebTestCase {
* @param integer $parent Parent book reference id. * @param integer $parent Parent book reference id.
*/ */
function createBookNode($book_nid, $parent = NULL) { function createBookNode($book_nid, $parent = NULL) {
// $number does not use drupal_static as it should not be reset
// since it uniquely identifies each call to createBookNode().
static $number = 0; // Used to ensure that when sorted nodes stay in same order. static $number = 0; // Used to ensure that when sorted nodes stay in same order.
$edit = array(); $edit = array();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment