updateded / fixed url rules for nice urls

dmstr · Jun 18, 2015 · 483ff55 · 483ff55
1 parent 363b049
commit 483ff55
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/Bootstrap.php b/Bootstrap.php
@@ -43,13 +43,9 @@ public function bootstrap($app)
         if (getenv('APP_PRETTY_URLS')) {
             $app->urlManager->addRules(
                 [
-                     // pages default page route
+                    // pages default page route
                     '<parentLeave:[a-zA-Z0-9_\-\.]*>/<pageName:[a-zA-Z0-9_\-\.]*>-<id:[0-9]*>.html' => 'pages/default/page',
-                    '<pageName:[a-zA-Z0-9_\-\.]*>-<id:[0-9]*>.html' => 'pages/default/page',
-
-                    // site/index page route
-                    '<parentLeave:[a-zA-Z0-9_\-\.]*>/<pageName:[a-zA-Z0-9_\-\.]*>-<id:[0-9]*>.html' => 'site/index',
-                    '<pageName:[a-zA-Z0-9_\-\.]*>-<id:[0-9]*>.html' => 'site/index',
+                    '<pageName:[a-zA-Z0-9_\-\.]*>-<id:[0-9]*>.html'                                 => 'pages/default/page',
                 ]
             );
         }

diff --git a/controllers/DefaultController.php b/controllers/DefaultController.php
@@ -69,7 +69,7 @@ public function actionIndex()
         return $this->render('index');
     }
 
-    public function actionPage($id)
+    public function actionPage($id, $pageName = null, $parentLeave = null)
     {
         Url::remember();
         \Yii::$app->session['__crudReturnUrl'] = null;