Browse Source

Merge pull request #7218 from cakephp/fix-viewPath

avoid the extra '/' in viewPath if prefix is set to false
Mark Story 10 years ago
parent
commit
901894156f
2 changed files with 4 additions and 1 deletions
  1. 1 1
      src/Controller/Controller.php
  2. 3 0
      tests/TestCase/Controller/ControllerTest.php

+ 1 - 1
src/Controller/Controller.php

@@ -375,7 +375,7 @@ class Controller implements EventListenerInterface, EventDispatcherInterface
 
         if (!$this->viewPath) {
             $viewPath = $this->name;
-            if (isset($request->params['prefix'])) {
+            if (!empty($request->params['prefix'])) {
                 $prefixes = array_map(
                     'Cake\Utility\Inflector::camelize',
                     explode('/', $request->params['prefix'])

+ 3 - 0
tests/TestCase/Controller/ControllerTest.php

@@ -871,6 +871,9 @@ class ControllerTest extends TestCase
         $this->assertEquals('Admin' . DS . 'Super' . DS . 'Posts', $Controller->viewPath);
 
         $request = new Request('pages/home');
+        $request->addParams([
+            'prefix' => false
+        ]);
         $Controller = new \TestApp\Controller\PagesController($request, $response);
         $this->assertEquals('Pages', $Controller->viewPath);
     }