adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-10 13:32:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.0' into 2.1

Browse source 
Conflicts:
	lib/Cake/View/ThemeView.php
This commit is contained in:
Ceeram 2012-01-26 21:40:18 +01:00
commit 7eda0affe3
8 changed files with 86 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/View/Helper/HtmlHelper.php
View file

@ -489,7 +489,7 @@ class HtmlHelper extends AppHelper {
*
* Add the script file to the `$scripts_for_layout` layout var:
*
* `$this->Html->script('styles.js', null, array('inline' => false));`
* `$this->Html->script('styles.js', array('inline' => false));`
*
* Add the script file to a custom block:
*

2
lib/Cake/View/ThemeView.php
View file

@ -27,5 +27,5 @@ App::uses('View', 'View');
* @package Cake.View
*/
class ThemeView extends View {
}