Merge branch 'master' into 2.6

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

5
.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 #
###################### ######################

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();