updated core from 8.4 to 8.5 : bug with login_destination
This commit is contained in:
@@ -8,8 +8,8 @@ dependencies:
|
||||
- node
|
||||
configure: book.settings
|
||||
|
||||
# Information added by Drupal.org packaging script on 2018-01-03
|
||||
version: '8.4.4'
|
||||
# Information added by Drupal.org packaging script on 2018-03-07
|
||||
version: '8.5.0'
|
||||
core: '8.x'
|
||||
project: 'drupal'
|
||||
datestamp: 1515021228
|
||||
datestamp: 1520457826
|
||||
|
||||
+1
@@ -2,6 +2,7 @@ id: d6_book
|
||||
label: Books
|
||||
migration_tags:
|
||||
- Drupal 6
|
||||
- Content
|
||||
source:
|
||||
plugin: d6_book
|
||||
process:
|
||||
+1
@@ -2,6 +2,7 @@ id: d6_book_settings
|
||||
label: Book configuration
|
||||
migration_tags:
|
||||
- Drupal 6
|
||||
- Configuration
|
||||
source:
|
||||
plugin: variable
|
||||
variables:
|
||||
@@ -39,12 +39,14 @@ class BookOutline {
|
||||
if ($book_link['pid'] == 0) {
|
||||
return NULL;
|
||||
}
|
||||
// Assigning the array to $flat resets the array pointer for use with each().
|
||||
$flat = $this->bookManager->bookTreeGetFlat($book_link);
|
||||
reset($flat);
|
||||
$curr = NULL;
|
||||
do {
|
||||
$prev = $curr;
|
||||
list($key, $curr) = each($flat);
|
||||
$key = key($flat);
|
||||
$curr = current($flat);
|
||||
next($flat);
|
||||
} while ($key && $key != $book_link['nid']);
|
||||
|
||||
if ($key == $book_link['nid']) {
|
||||
@@ -78,10 +80,11 @@ class BookOutline {
|
||||
* $book_link.
|
||||
*/
|
||||
public function nextLink(array $book_link) {
|
||||
// Assigning the array to $flat resets the array pointer for use with each().
|
||||
$flat = $this->bookManager->bookTreeGetFlat($book_link);
|
||||
reset($flat);
|
||||
do {
|
||||
list($key,) = each($flat);
|
||||
$key = key($flat);
|
||||
next($flat);
|
||||
} while ($key && $key != $book_link['nid']);
|
||||
|
||||
if ($key == $book_link['nid']) {
|
||||
|
||||
@@ -69,7 +69,7 @@ interface BookOutlineStorageInterface {
|
||||
public function delete($nid);
|
||||
|
||||
/**
|
||||
* Loads book's children using it's parent ID.
|
||||
* Loads book's children using its parent ID.
|
||||
*
|
||||
* @param int $pid
|
||||
* The book's parent ID.
|
||||
|
||||
@@ -15,6 +15,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
|
||||
/**
|
||||
* Provides a form for administering a single book's hierarchy.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class BookAdminEditForm extends FormBase {
|
||||
|
||||
|
||||
@@ -13,6 +13,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
|
||||
/**
|
||||
* Displays the book outline form.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class BookOutlineForm extends ContentEntityForm {
|
||||
|
||||
|
||||
@@ -10,6 +10,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
|
||||
/**
|
||||
* Remove form for book module.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class BookRemoveForm extends ConfirmFormBase {
|
||||
|
||||
|
||||
@@ -7,6 +7,8 @@ use Drupal\Core\Form\FormStateInterface;
|
||||
|
||||
/**
|
||||
* Configure book settings for this site.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class BookSettingsForm extends ConfigFormBase {
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@ package: Testing
|
||||
# version: VERSION
|
||||
# core: 8.x
|
||||
|
||||
# Information added by Drupal.org packaging script on 2018-01-03
|
||||
version: '8.4.4'
|
||||
# Information added by Drupal.org packaging script on 2018-03-07
|
||||
version: '8.5.0'
|
||||
core: '8.x'
|
||||
project: 'drupal'
|
||||
datestamp: 1515021228
|
||||
datestamp: 1520457826
|
||||
|
||||
@@ -5,8 +5,8 @@ package: Testing
|
||||
# version: VERSION
|
||||
# core: 8.x
|
||||
|
||||
# Information added by Drupal.org packaging script on 2018-01-03
|
||||
version: '8.4.4'
|
||||
# Information added by Drupal.org packaging script on 2018-03-07
|
||||
version: '8.5.0'
|
||||
core: '8.x'
|
||||
project: 'drupal'
|
||||
datestamp: 1515021228
|
||||
datestamp: 1520457826
|
||||
|
||||
@@ -8,8 +8,8 @@ dependencies:
|
||||
- book
|
||||
- views
|
||||
|
||||
# Information added by Drupal.org packaging script on 2018-01-03
|
||||
version: '8.4.4'
|
||||
# Information added by Drupal.org packaging script on 2018-03-07
|
||||
version: '8.5.0'
|
||||
core: '8.x'
|
||||
project: 'drupal'
|
||||
datestamp: 1515021228
|
||||
datestamp: 1520457826
|
||||
|
||||
@@ -13,7 +13,7 @@ class BookTest extends MigrateSqlSourceTestBase {
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public static $modules = ['book', 'migrate_drupal'];
|
||||
public static $modules = ['book', 'migrate_drupal', 'node'];
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
|
||||
Reference in New Issue
Block a user