opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.1.5. For more information, see https://www.drupal.org/project/drupal/releases/8.1.5

Browse source
This commit is contained in:
Pantheon Automation 2016-07-07 09:44:38 -07:00 • committed by Greg Anderson
parent 13b6ca7cc2
commit 38ba7c357d
342 changed files with 7814 additions and 1534 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/modules/book/src/BookManagerInterface.php
View file

@ -18,6 +18,8 @@ interface BookManagerInterface {
* Since this can be the full tree including hidden items, the data returned
* may be used for generating an an admin interface or a select.
*
* Note: based on menu_tree_all_data().
*
* @param int $bid
* The Book ID to find links for.
* @param array|null $link
@ -31,8 +33,6 @@ interface BookManagerInterface {
*
* @return array
* An tree of menu links in an array, in the order they should be rendered.
*
* Note: based on menu_tree_all_data().
*/
public function bookTreeAllData($bid, $link = NULL, $max_depth = NULL);

2
core/modules/book/src/Plugin/migrate/source/d6/Book.php
View file

@ -23,7 +23,7 @@ class Book extends DrupalSqlBase {
for ($i = 1; $i <= 9; $i++) {
$field = "p$i";
$ml_fields[] = $field;
$query->orderBy($field);
$query->orderBy('ml.' . $field);
}
$query->fields('ml', $ml_fields);
return $query;