|
@@ -368,7 +368,7 @@ discard block |
|
|
block discarded – undo |
|
368
|
368
|
/** @var \LCI\Blend\Blendable\Resource $blendResource */ |
|
369
|
369
|
$blendResource = new Resource($this->modx, $this->blender, $this->blender->getAliasFromSeedKey($seed_key), $context); |
|
370
|
370
|
|
|
371
|
|
- if(!$this->revertOneFromMany($blendResource, $seed_key, 'Resource', $seeds_dir)) { |
|
|
371
|
+ if (!$this->revertOneFromMany($blendResource, $seed_key, 'Resource', $seeds_dir)) { |
|
372
|
372
|
$saved = false; |
|
373
|
373
|
} |
|
374
|
374
|
} |
|
@@ -498,11 +498,11 @@ discard block |
|
|
block discarded – undo |
|
498
|
498
|
} |
|
499
|
499
|
|
|
500
|
500
|
if ($success = $blendable->blendFromSeed($seed_key, $overwrite)) { |
|
501
|
|
- $this->blender->outSuccess($seed_key.' ' . $object_type . ' has been blended into primary key: ' . |
|
|
501
|
+ $this->blender->outSuccess($seed_key.' '.$object_type.' has been blended into primary key: '. |
|
502
|
502
|
$blendable->getXPDOSimpleObject()->getPrimaryKey()); |
|
503
|
503
|
|
|
504
|
504
|
} elseif ($blendable->isExists()) { |
|
505
|
|
- $this->blender->outError($seed_key.' ' . $object_type .' already exists'); |
|
|
505
|
+ $this->blender->outError($seed_key.' '.$object_type.' already exists'); |
|
506
|
506
|
if ($this->userInteractionHandler->promptConfirm('Would you like to update?', true)) { |
|
507
|
507
|
if ($success = $blendable->blendFromSeed($seed_key, true)) { |
|
508
|
508
|
$this->blender->out($seed_key.' has been blended'); |
|
@@ -510,7 +510,7 @@ discard block |
|
|
block discarded – undo |
|
510
|
510
|
} |
|
511
|
511
|
|
|
512
|
512
|
} else { |
|
513
|
|
- $this->blender->outError('There was an error saving the ' . $object_type . ' for seed key '. $seed_key); |
|
|
513
|
+ $this->blender->outError('There was an error saving the '.$object_type.' for seed key '.$seed_key); |
|
514
|
514
|
} |
|
515
|
515
|
|
|
516
|
516
|
return $success; |
|
@@ -531,7 +531,7 @@ discard block |
|
|
block discarded – undo |
|
531
|
531
|
} |
|
532
|
532
|
|
|
533
|
533
|
if ($success = $blendable->revertBlend()) { |
|
534
|
|
- $this->blender->outSuccess($seed_key.' ' . $object_type . ' has been reverted to '.$seeds_dir); |
|
|
534
|
+ $this->blender->outSuccess($seed_key.' '.$object_type.' has been reverted to '.$seeds_dir); |
|
535
|
535
|
|
|
536
|
536
|
} else { |
|
537
|
537
|
$this->blender->outError($seed_key.' chunk was not reverted'); |