Merged branch master into issue_141

CHANGELOG.md

@@ -1,4 +1,20 @@
 
+## [2.16.3] - 2017-2-7
+* [[`b4c353567a`](https://github.com/abecms/abecms/commit/b4c353567a)] - **fix**: error in unpublish event (gregorybesson) 
+* [[`f3bc9cc3e9`](https://github.com/abecms/abecms/commit/f3bc9cc3e9)] - **fix**: error in unpublish event (gregorybesson) 
+* [[`febc3db8c0`](https://github.com/abecms/abecms/commit/febc3db8c0)] - **doc**: CHANGELOG (gregorybesson) 
+
+## [2.16.2] - 2017-2-7
+* [[`f342a9570e`](https://github.com/abecms/abecms/commit/f342a9570e)] - **doc**: CHANGELOG (gregorybesson) 
+* [[`a18b0accab`](https://github.com/abecms/abecms/commit/a18b0accab)] - Merge branch 'master' of https://github.com/abecms/abecms (gregorybesson) 
+
+## [2.16.1] - 2017-2-7
+* [[`8cd5b039d1`](https://github.com/abecms/abecms/commit/8cd5b039d1)] - Merge pull request #145 from wonknu/bug_slug_w_slash (Greg Besson) 
+* [[`0fad2fd85a`](https://github.com/abecms/abecms/commit/0fad2fd85a)] - **fix**: wrong regex w slashes (wonknu10) 
+* [[`70f99c21d4`](https://github.com/abecms/abecms/commit/70f99c21d4)] - Merge pull request #144 from wonknu/master (Greg Besson) 
+* [[`3859519b01`](https://github.com/abecms/abecms/commit/3859519b01)] - **fix**: autocomplete source attributes doesn't escape single quote (wonknu10) 
+* [[`81427b7ad8`](https://github.com/abecms/abecms/commit/81427b7ad8)] - **doc**: CHANGELOG (gregorybesson) 
+
 ## [2.16.0] - 2017-2-4
 * [[`2b5b2ac638`](https://github.com/abecms/abecms/commit/2b5b2ac638)] - Merge pull request #133 from nicolaslabbe/drag_autocomplete (Greg Besson) 
 * [[`df9cf42fbf`](https://github.com/abecms/abecms/commit/df9cf42fbf)] - **fix**: {{#each}} statement when {{/each}} was on the same line produced bugs (gregorybesson) 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "abecms",
-  "version": "2.16.0",
+  "version": "2.16.3",
   "description": "Abe: The lightning fast CMS",
   "main": "src/server/app.js",
   "repository": {

src/cli/cms/operations/post.js

@@ -113,7 +113,7 @@ export function unpublish(filePath) {
 
       p.then((result) => {
         cmsOperations.remove.removeFile(revisionPath, postPath)
-        abeExtend.hooks.instance.trigger('afterUnpublish', revisionPath, postPath)
+        abeExtend.hooks.instance.trigger('afterUnpublish', revisionPath, postPath, result.json)
         var newRevisionPath = path.join(config.root, config.data.url, result.json.abe_meta.latest.abeUrl.replace(`.${config.files.templates.extension}`, '.json'))
         Manager.instance.updatePostInList(newRevisionPath)
         resolve(result)

src/hooks/hooks.js

@@ -21,15 +21,15 @@ var hooks = {
     return html
   },
 
-  /***************** create *****************/
+  /***************** delete *****************/
   beforeDeleteFile: (filePath, abe) => {
     return filePath
   },
   afterDeleteFile: (path, json, abe) => {
     return path
   },
 
-  /***************** publish *****************/
+  /***************** reject *****************/
   beforeReject: (json, filePath, tplPath, abe) => {
     return json
   },
@@ -41,15 +41,15 @@ var hooks = {
   beforePublish: (json, filePath, tplPath, abe) => {
     return json
   },
-  afterPublish: (result, abe) => {
+  afterPublish: (result, filePath, abe) => {
     return result
   },
 
   /***************** unpublish *****************/
   beforeUnpublish: (filePath, abe) => {
     return filePath
   },
-  afterUnpublish: (path, json, abe) => {
+  afterUnpublish: (path, postPath, json, abe) => {
     return path
   },