Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
drupal-3485117
Manage
Activity
Members
Labels
Plan
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Issue forks
drupal-3485117
Commits
2542cdb0
Commit
2542cdb0
authored
8 years ago
by
catch
Browse files
Options
Downloads
Patches
Plain Diff
Issue
#2824444
by Adita, mikeryan: Remove obsolete try/catch from d6_cck_file
parent
3408c306
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
core/modules/file/src/Plugin/migrate/process/d6/CckFile.php
+1
-13
1 addition, 13 deletions
core/modules/file/src/Plugin/migrate/process/d6/CckFile.php
with
1 addition
and
13 deletions
core/modules/file/src/Plugin/migrate/process/d6/CckFile.php
+
1
−
13
View file @
2542cdb0
...
...
@@ -5,7 +5,6 @@
use
Drupal\Core\Plugin\ContainerFactoryPluginInterface
;
use
Drupal\migrate\Plugin\MigrationInterface
;
use
Drupal\migrate\MigrateExecutableInterface
;
use
Drupal\migrate\MigrateSkipRowException
;
use
Drupal\migrate\Plugin\MigrateProcessInterface
;
use
Drupal\migrate\ProcessPluginBase
;
use
Drupal\migrate\Row
;
...
...
@@ -76,18 +75,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
// some reason -- file migration is notoriously brittle -- and we do NOT
// want to send invalid file references into the field system (it causes
// fatals), so return an empty item instead.
try
{
$fid
=
$this
->
migrationPlugin
->
transform
(
$value
[
'fid'
],
$migrate_executable
,
$row
,
$destination_property
);
}
// If the migration plugin completely fails its lookup process, it will
// throw a MigrateSkipRowException. It shouldn't, but that is being dealt
// with at https://www.drupal.org/node/2487568. Until that lands, return
// an empty item.
catch
(
MigrateSkipRowException
$e
)
{
return
[];
}
if
(
$fid
)
{
if
(
$fid
=
$this
->
migrationPlugin
->
transform
(
$value
[
'fid'
],
$migrate_executable
,
$row
,
$destination_property
))
{
return
[
'target_id'
=>
$fid
,
'display'
=>
$value
[
'list'
],
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment