Skip to content

Commit

Permalink
Merge pull request #12 from mautic/version131
Browse files Browse the repository at this point in the history
Version131
  • Loading branch information
Woeler authored Aug 3, 2017
2 parents 0368310 + 389c536 commit f0161a2
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions Classes/Domain/Finishers/MauticFinisher.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ protected function executeInternal()
{
$formDefinition = $this->finisherContext->getFormRuntime()->getFormDefinition()->getRenderingOptions();

if (empty($finisherSettings = $this->parseOption('mauticId'))) {
$mauticId = $formDefinition['mauticId'];
if (empty($this->parseOption('mauticId'))) {
$mauticId = (int) $formDefinition['mauticId'];
} else {
$mauticId = $finisherSettings = $this->parseOption('mauticId');
$mauticId = (int) $this->parseOption('mauticId');
}

if (!$this->mauticService->checkConfigPresent()) {
Expand All @@ -53,7 +53,7 @@ protected function executeInternal()
return;
}

if (!empty($mauticId) && is_numeric($mauticId)) {
if (!empty($mauticId)) {

// Get the values that were posted in the form and transform them to a format for Mautic
$formValues = $this->transformFormStructure($this->finisherContext->getFormValues());
Expand Down
4 changes: 2 additions & 2 deletions Configuration/Yaml/Backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ TYPO3:

propertyCollections:
finishers:
1100:
1000:
__inheritances:
10: 'TYPO3.CMS.Form.mixins.formElementMixins.mauticContactFinisherMixin'
identifier: 'MauticContactFinisher'
1101:
1010:
__inheritances:
10: 'TYPO3.CMS.Form.mixins.formElementMixins.mauticFinisherMixin'
identifier: 'MauticFinisher'
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ EXT:mautic ![Travis](https://travis-ci.org/mautic/mautic-typo3.svg?branch=master

Welcome to the official TYPO3 extension for Mautic!

Version: 1.3.0
Version: 1.3.1

State: Beta.

Expand Down Expand Up @@ -32,7 +32,7 @@ Add the following to the composer.json of your TYPO3 installation
{ "type": "vcs", "url": "[email protected]:mautic/mautic-typo3.git" }
],
require {
"mautic/mautic-typo3": "1.0^"
"mautic/mautic-typo3": "^1.3"
}
```

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "typo3-cms-extension",
"description": "An extension to sync forms between TYPO3 and Mautic",
"homepage": "https://github.com/mautic/mautic-typo3",
"version": "1.3.0",
"version": "1.3.1",
"license": ["GPL3"],
"authors": [
{
Expand Down
2 changes: 1 addition & 1 deletion ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
'title' => 'Mautic',
'description' => 'An extension to sync forms between TYPO3 and Mautic',
'category' => 'be',
'version' => '1.3.0',
'version' => '1.3.1',
'state' => 'beta',
'clearcacheonload' => 0,
'author' => 'Woeler',
Expand Down

0 comments on commit f0161a2

Please sign in to comment.