Skip to content

Commit

Permalink
Merged branch master into master
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolaslabbe committed Oct 12, 2016
2 parents 7c75137 + 45ad4f4 commit 9028e02
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "abe-cli",
"version": "2.5.7",
"version": "2.5.8",
"description": "Abe command line tool",
"main": "src/server/app.js",
"repository": {
Expand Down
5 changes: 4 additions & 1 deletion src/cli/cms/templates/template.js
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,10 @@ export function getStructureAndTemplatesFiles() {
try {
var directoryTemplate = fse.lstatSync(path.join(site.path, templates))
if (directoryTemplate.isDirectory()) {
result.templates = result.templates.concat(cmsData.file.getFiles(path.join(site.path, templates), true, 10, new RegExp(`.${config.files.templates.extension}`)))
var resultTemplates = result.templates.concat(cmsData.file.getFiles(path.join(site.path, templates), true, 10, new RegExp(`.${config.files.templates.extension}`)))
result.templates = resultTemplates.filter(function (resultTemplate) {
return resultTemplate.path.indexOf(config.partials) < 0
})
}
} catch (e) {
}
Expand Down

0 comments on commit 9028e02

Please sign in to comment.