Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2890514 by quietone, vomitHatSteve, heddn: upgrade_d6_imagecache_presets fails if blank "action" is enountered

merge-requests/55/head
Alex Pott 2019-09-21 23:33:50 +01:00
parent bb3791d9de
commit 820c3d83a3
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/modules/image/src/Plugin/migrate/process/d6/ImageCacheActions.php
View File

@ -20,6 +20,9 @@ class ImageCacheActions extends ProcessPluginBase {
$effects = []; $effects = [];
foreach ($row->getSourceProperty('actions') as $action) { foreach ($row->getSourceProperty('actions') as $action) {
if (empty($action['action'])) {
continue;
}
$id = preg_replace('/^imagecache/', 'image', $action['action']); $id = preg_replace('/^imagecache/', 'image', $action['action']);
if ($id === 'image_crop') { if ($id === 'image_crop') {

8
core/modules/migrate_drupal/tests/fixtures/drupal6.php vendored
View File

@ -10645,6 +10645,14 @@ $connection->insert('imagecache_action')
'action' => 'imagecache_rotate', 'action' => 'imagecache_rotate',
'data' => 'a:3:{s:7:"degrees";s:2:"55";s:6:"random";i:0;s:7:"bgcolor";s:0:"";}', 'data' => 'a:3:{s:7:"degrees";s:2:"55";s:6:"random";i:0;s:7:"bgcolor";s:0:"";}',
)) ))
->values(array(
'actionid' => '7',
'presetid' => '2',
'weight' => '0',
'module' => 'imagecache',
'action' => '',
'data' => 'a:3:{s:7:"degrees";s:2:"55";s:6:"random";i:0;s:7:"bgcolor";s:0:"";}',
))
->execute(); ->execute();
$connection->schema()->createTable('imagecache_preset', array( $connection->schema()->createTable('imagecache_preset', array(
'fields' => array( 'fields' => array(