Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release'
Browse files Browse the repository at this point in the history
  • Loading branch information
ssachtleben committed Jan 8, 2020
2 parents 70b5d22 + 6e9a395 commit bb9c000
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Controller/Router.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ protected function _getRouteSettings($magazine, $path, \Magento\Framework\App\Re

protected function _getRequestPath(\Magento\Framework\App\RequestInterface $request)
{
return trim($request->getRequestString(), '/');
return trim($request->getPathInfo(), '/');
}

/**
Expand Down
2 changes: 1 addition & 1 deletion Helper/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ public function getLanguageCode()
*/
public function getPluginVersion()
{
return "2.1.2";
return "2.1.3";
}

/**
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

Requires:
* PHP >= 5.4
* Magento 2, for our Magento 1 plugin check this https://github.com/styladev/magentoStylaConnect2
* Magento 2, for our Magento 1 plugin check this https://github.com/styladev/magentoStylaConnect
* Magento REST API activated to share product information http://devdocs.magento.com/guides/v2.0/rest/bk-rest.html

Styla Connect is a module to connect your Magento 2 Store with [Styla](http://www.styla.com/) by embedding Styla content on a specific path and providing a source of product data. [This documentation page](https://docs.styla.com/) should provide you an overview of how Styla works in general.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "styla/magento2-connect",
"description": "A Magento 2 Styla Magazine support",
"type": "magento2-module",
"version": "2.1.2",
"version": "2.1.3",
"require": {
"php": ">=5.5"
},
Expand Down

0 comments on commit bb9c000

Please sign in to comment.