brmlab/brmsklad
4
0
Fork 0
mirror of https://github.com/brmlab/brmsklad.git synced 2025-08-03 22:53:58 +02:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade CakePHP from 2.2.5 to 2.9.5

Browse source
This commit is contained in:
Brm Ko 2017-02-26 15:29:44 +01:00
parent 5a580df460
commit 235a541597
793 changed files with 60746 additions and 23753 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/Cake/View/ScaffoldView.php
View file

@ -4,29 +4,29 @@
*
* Automatic forms and actions generation for rapid web application development.
*
* PHP 5
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The MIT License
* For full copyright and license information, please see the LICENSE.txt
* Redistributions of files must retain the above copyright notice.
*
* @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project
* @package Cake.View
* @since Cake v 0.10.0.1076
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
App::uses('ThemeView', 'View');
App::uses('View', 'View');
/**
* ScaffoldView provides specific view file loading features for scaffolded views.
*
* @package Cake.View
* @package Cake.View
* @deprecated 3.0.0 Dynamic scaffolding will be removed and replaced in 3.0
*/
class ScaffoldView extends ThemeView {
class ScaffoldView extends View {
/**
* Override _getViewFileName Appends special scaffolding views in.
@ -51,13 +51,13 @@ class ScaffoldView extends ThemeView {
}
}
if ($name === 'add' || $name == 'edit') {
if ($name === 'add' || $name === 'edit') {
$name = 'form';
}
$scaffoldAction = 'scaffold.' . $name;
if (!is_null($this->subDir)) {
if ($this->subDir !== null) {
$subDir = strtolower($this->subDir) . DS;
} else {
$subDir = null;