commit 1ae3eae9dc07289a75a1c084c1d38bab6be7e1d3 Author: Matthew Radcliffe Date: Fri May 24 13:08:43 2013 -0700 Issue #1871700 by mradcliffe: Fix whitespace and syntax issues. Oops. diff --git a/core/modules/book/book.install b/core/modules/book/book.install index 39842d8..7121a96 100644 --- a/core/modules/book/book.install +++ b/core/modules/book/book.install @@ -130,14 +130,14 @@ function book_update_8001() { 'path' => array( 'visibility' => $block->visibility, 'pages' => $block->pages, - ), - ), + ), + ), 'settings' => array( 'cache' => $block->cache, 'label' => $block->title, 'block_mode' => config('book.settings')->get('block.navigation.mode', 'all pages'), - ), - ); + ), + ); $ret = update_block_to_config($block_name, 'book', $block->delta, $properties); } } diff --git a/core/modules/comment/comment.install b/core/modules/comment/comment.install index 30a157e..5270384 100644 --- a/core/modules/comment/comment.install +++ b/core/modules/comment/comment.install @@ -422,13 +422,13 @@ function comment_update_8005() { 'path' => array( 'visibility' => $block->visibility, 'pages' => $block->pages, - ), - ), + ), + ), 'settings' => array( 'cache' => $block->cache, 'label' => $block->title, 'block_count' => config('comment.settings')->get('block.recent_comments.limit', 10), - ), + ), ); $ret = update_block_to_config($block_name, 'comment', $block->delta, $properties); } diff --git a/core/modules/forum/forum.install b/core/modules/forum/forum.install index afab64c..2f870ce 100644 --- a/core/modules/forum/forum.install +++ b/core/modules/forum/forum.install @@ -308,7 +308,7 @@ function forum_update_8001() { 'administrative' => TRUE, ), 'block_count' => config('book.settings')->get('block.' . $block->delta . '.limit', 5), - ), + ), ); $ret = update_block_to_config($block_name, 'forum', $block->delta, $properties); } diff --git a/core/modules/node/node.install b/core/modules/node/node.install index 810d9fa..74f087c 100644 --- a/core/modules/node/node.install +++ b/core/modules/node/node.install @@ -673,7 +673,7 @@ function node_update_8008() { function node_update_8009() { update_variables_to_config('node.settings', array( 'default_nodes_main' => 'items_per_page', - 'node_recent_block_count', => 'block.recent_content.limit', + 'node_recent_block_count' => 'block.recent_content.limit', )); } @@ -793,7 +793,7 @@ function node_update_8016() { ); if ($block->delta == 'recent') { - 'block_count' => config('node.settings')->get('block.recent_content.limit', 10); + $properties['block_count'] = config('node.settings')->get('block.recent_content.limit', 10); } $ret = update_block_to_config($block_name, 'node', $block->delta, $properties); diff --git a/core/modules/search/search.install b/core/modules/search/search.install index 259b52b..975bf58 100644 --- a/core/modules/search/search.install +++ b/core/modules/search/search.install @@ -239,13 +239,13 @@ function search_update_8002() { 'path' => array( 'visibility' => $block->visibility, 'pages' => $block->pages, - ), - ), + ), + ), 'settings' => array( 'cache' => $block->cache, 'label' => $block->title, - ), - ); + ), + ); $ret = update_block_to_config($block_name, 'search', $block->delta, $properties); } } diff --git a/core/modules/shortcut/shortcut.install b/core/modules/shortcut/shortcut.install index 2baabd3..7547ef7 100644 --- a/core/modules/shortcut/shortcut.install +++ b/core/modules/shortcut/shortcut.install @@ -125,13 +125,13 @@ function shortcut_update_8002() { 'path' => array( 'visibility' => $block->visibility, 'pages' => $block->pages, - ), - ), + ), + ), 'settings' => array( 'cache' => $block->cache, 'label' => $block->title, - ), - ); + ), + ); $ret = update_block_to_config($block_name, 'shortcut', $block->delta, $properties); } } diff --git a/core/modules/system/system.install b/core/modules/system/system.install index be60ef9..42ad553 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -2243,13 +2243,13 @@ function system_update_8057() { 'path' => array( 'visibility' => $block->visibility, 'pages' => $block->pages, - ), - ), + ), + ), 'settings' => array( 'cache' => $block->cache, 'label' => $block->title, - ), - ); + ), + ); $ret = update_block_to_config($block_name, 'system', $block->delta, $properties); } }