dev

skeeks-cms · Aug 19, 2017 · 9c3500d · 9c3500d
1 parent a61dcbc
commit 9c3500d
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/src/controllers/ContentElementController.php b/src/controllers/ContentElementController.php
@@ -15,6 +15,7 @@
 use skeeks\cms\models\Tree;
 use Yii;
 use yii\helpers\ArrayHelper;
+use yii\helpers\Url;
 use yii\web\NotFoundHttpException;
 
 /**
@@ -115,12 +116,26 @@ public function actionView()
         $tree               = $contentElement->cmsTree;
 
 
-        if ($contentElement->url != "/" . \Yii::$app->request->pathInfo)
+        if (Url::isRelative($contentElement->url))
         {
-            $url = $contentElement->url;
-            \Yii::$app->response->redirect($url, 301);
+            if ($contentElement->url != "/" . \Yii::$app->request->pathInfo)
+            {
+                $url = $contentElement->url;
+                \Yii::$app->response->redirect($url, 301);
+            }
+        } else
+        {
+            if ($urlData = parse_url($contentElement->url))
+            {
+                if (ArrayHelper::getValue($urlData, 'path') != "/" . \Yii::$app->request->pathInfo)
+                {
+                    $url = $contentElement->url;
+                    \Yii::$app->response->redirect($url, 301);
+                }
+            }
         }
 
+
         if ($tree)
         {
             \Yii::$app->cms->setCurrentTree($tree);