Browse Source

Configure::read('App.wwwRoot') in camelBack.

euromark 11 years ago
parent
commit
f3c31c060f

+ 1 - 1
src/View/Helper/UrlHelper.php

@@ -155,7 +155,7 @@ class UrlHelper extends Helper {
 				$file = str_replace('/', '\\', $file);
 			}
 
-			if (file_exists(Configure::read('App.www_root') . $theme . $file)) {
+			if (file_exists(Configure::read('App.wwwRoot') . $theme . $file)) {
 				$webPath = $this->request->webroot . $theme . $asset[0];
 			} else {
 				$themePath = Plugin::path($this->theme);

+ 2 - 2
tests/TestCase/View/Helper/HtmlHelperTest.php

@@ -480,8 +480,8 @@ class HtmlHelperTest extends TestCase {
  * @return void
  */
 	public function testThemeAssetsInMainWebrootPath() {
-		$webRoot = Configure::read('App.www_root');
-		Configure::write('App.www_root', TEST_APP . 'webroot/');
+		$webRoot = Configure::read('App.wwwRoot');
+		Configure::write('App.wwwRoot', TEST_APP . 'webroot/');
 
 		$this->Html->Url->theme = 'TestTheme';
 		$result = $this->Html->css('webroot_test');

+ 3 - 3
tests/TestCase/View/Helper/UrlHelperTest.php

@@ -261,8 +261,8 @@ class UrlHelperTest extends TestCase {
 		$expected = '/test_theme/img/test.jpg';
 		$this->assertEquals($expected, $result);
 
-		$webRoot = Configure::read('App.www_root');
-		Configure::write('App.www_root', TEST_APP . 'TestApp/webroot/');
+		$webRoot = Configure::read('App.wwwRoot');
+		Configure::write('App.wwwRoot', TEST_APP . 'TestApp/webroot/');
 
 		$result = $this->Helper->webroot('/img/cake.power.gif');
 		$expected = '/test_theme/img/cake.power.gif';
@@ -280,7 +280,7 @@ class UrlHelperTest extends TestCase {
 		$expected = '/img/cake.icon.gif?some=param';
 		$this->assertEquals($expected, $result);
 
-		Configure::write('App.www_root', $webRoot);
+		Configure::write('App.wwwRoot', $webRoot);
 	}
 
 }