adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.6

Browse source
This commit is contained in:
mark_story 2014-07-18 21:50:05 -04:00
commit 0aabc5d910
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -8,6 +8,11 @@
/build /build
/dist /dist
/tags /tags
*.mo
# IDE and editor specific files #
#################################
.idea
# OS generated files # # OS generated files #
###################### ######################
@ -18,4 +23,4 @@
.Trashes .Trashes
Icon? Icon?
ehthumbs.db ehthumbs.db
Thumbs.db Thumbs.db

1
lib/Cake/Console/Command/Task/ControllerTask.php
View file

@ -188,6 +188,7 @@ class ControllerTask extends BakeTask {
if (strtolower($wannaUseSession) === 'y') { if (strtolower($wannaUseSession) === 'y') {
array_push($components, 'Session'); array_push($components, 'Session');
} }
array_unique($components);
} }
} else { } else {
list($wannaBakeCrud, $wannaBakeAdminCrud) = $this->_askAboutMethods(); list($wannaBakeCrud, $wannaBakeAdminCrud) = $this->_askAboutMethods();