Merge branch 'release/1.1.2'

* release/1.1.2:
  Changelog for 1.1.2
  Fixes an exception that occured when trying to add a new commerce product with Portal installed.

CHANGELOG.md

@@ -7,6 +7,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## Unreleased
 
+## 1.1.2 - 2019-02-21
+
+### Fixed
+- Fixed an exception that occured when trying to add a new commerce product with Portal installed ([#8](https://github.com/angell-co/Portal/issues/8))
+
 
 ## 1.1.1 - 2019-02-19
 

src/Portal.php

@@ -212,10 +212,19 @@ private function _loadLivePreviewCpResources()
 
                 // Work out the Site
                 $siteHandle = null;
-                if (count($segments) === 4) {
+                if (count($segments) === 4 && $segments[ 3 ] !== 'new') {
                     $siteHandle = $segments[ 3 ];
                 }
 
+                // Deal with commerce routes
+                if ($segments[ 0 ] === 'commerce'
+                    && $segments[ 1 ] === 'products'
+                    && $segments[ 3 ] === 'new'
+                    && isset($segments[ 4 ])
+                ) {
+                    $siteHandle = $segments[ 4 ];
+                }
+
                 if ($siteHandle) {
                     $site = Craft::$app->getSites()->getSiteByHandle($siteHandle);