adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-03 18:12:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '1.3' into merger

Browse source 
Conflicts:
	cake/basics.php
	cake/console/libs/tasks/extract.php
	cake/libs/view/helpers/js.php
	cake/tests/cases/console/libs/tasks/extract.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/test_app/views/pages/extract.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Model/Behavior/ContainableBehavior.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
	lib/Cake/Test/Case/Model/CakeSchemaTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
This commit is contained in:
mark_story 2011-09-18 12:09:04 -04:00
commit 6a4e7558fc
12 changed files with 110 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/View/Helper/JsHelper.php
View file

@ -74,7 +74,7 @@ class JsHelper extends AppHelper {
*
* @var string
*/
public $setVariable = APP_DIR;
public $setVariable = 'app';
/**
* Constructor - determines engine helper
@ -419,4 +419,4 @@ class JsHelper extends AppHelper {
}
return array($options, $htmlOptions);
}
}
}