@@ -135,30 +135,9 @@ function execute() {
135
135
} else {
136
136
$ vars = $ this ->__loadController ();
137
137
$ methods = $ this ->_methodsToBake ();
138
- $ methods = array_diff (
139
- array_map ('strtolower ' , get_class_methods ($ this ->controllerName . 'Controller ' )),
140
- array_map ('strtolower ' , get_class_methods ('appcontroller ' ))
141
- );
142
- if (empty ($ methods )) {
143
- $ methods = $ this ->scaffoldActions ;
144
- }
145
- $ adminRoute = Configure::read ('Routing.admin ' );
146
- if ($ adminRoute && isset ($ this ->params ['admin ' ])) {
147
- foreach ($ methods as $ i => $ method ) {
148
- if (strpos ($ method , $ adminRoute . '_ ' ) === false ) {
149
- unset($ methods [$ i ]);
150
- }
151
- }
152
- }
153
- $ adminDelete = null ;
154
- if (!empty ($ adminRoute )) {
155
- $ adminDelete = $ adminRoute . '_delete ' ;
156
- }
157
138
foreach ($ methods as $ method ) {
158
- if ($ method {0 } != '_ ' && !in_array ($ method , array ('delete ' , $ adminDelete ))) {
159
- $ content = $ this ->getContent ($ method , $ vars );
160
- $ this ->bake ($ method , $ content );
161
- }
139
+ $ content = $ this ->getContent ($ method , $ vars );
140
+ $ this ->bake ($ method , $ content );
162
141
}
163
142
}
164
143
}
@@ -179,7 +158,7 @@ function _methodsToBake() {
179
158
}
180
159
$ adminRoute = Configure::read ('Routing.admin ' );
181
160
foreach ($ methods as $ i => $ method ) {
182
- if ($ method == 'delete ' || $ method = $ adminRoute . '_delete ' || $ method {0 } == '_ ' ) {
161
+ if ($ method == 'delete ' || $ method == $ adminRoute . '_delete ' || $ method {0 } == '_ ' ) {
183
162
unset($ methods [$ i ]);
184
163
}
185
164
if ($ adminRoute && isset ($ this ->params ['admin ' ]) && strpos ($ method , $ adminRoute . '_ ' ) === false ) {
0 commit comments