Merge pull request #249 from quetzyg/4.0

[4.0.7] Fix #233 properly

.gitattributes

@@ -1,5 +1,6 @@
 tests          export-ignore
 .gitattributes export-ignore
+.github        export-ignore
 .gitignore     export-ignore
 .travis.yml    export-ignore
 CHANGELOG.md   export-ignore

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,29 @@
+| Q                 | A
+| ----------------- | ---
+| Bug?              | no|yes
+| New Feature?      | no|yes
+| Framework         | Laravel|Lumen
+| Framework version | 5.x.y
+| Package version   | 4.x.y
+| PHP version       | 5.x.y|7.x.y
+
+#### Actual Behaviour
+
+Describe the behaviour you're experiencing.
+
+
+#### Expected Behaviour
+
+Describe the behaviour you're expecting.
+
+
+#### Steps to Reproduce
+
+List all the steps needed to reproduce the issue. Make sure to include the code you're using,
+any screenshots and/or other resources you find pertinent.
+
+
+#### Possible Solutions
+
+If you have any ideas on how to solve the issue, add them here.
+If not, omit this part.

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v4.0.7 (2017-06-04)
+### Added
+- GitHub issue template file
+
+### Fixed
+- Properly fixed issue ([#233](https://github.com/owen-it/laravel-auditing/issues/233))
+
 ## v4.0.6 (2017-05-21)
 ### Fixed
 - Calling a member function on null ([#244](https://github.com/owen-it/laravel-auditing/issues/244))

src/AuditableObserver.php

@@ -48,7 +48,7 @@ public function created(AuditableContract $model)
     public function updated(AuditableContract $model)
     {
         // Ignore the updated event when restoring
-        if (!static::$restoring || true) {
+        if (!static::$restoring) {
             Auditor::execute($model->setAuditEvent('updated'));
         }
     }
@@ -92,7 +92,7 @@ public function restored(AuditableContract $model)
         Auditor::execute($model->setAuditEvent('restored'));
 
         // Once the model is restored, we need to put everything back
-        // as before, in case an legitimate update event is fired
+        // as before, in case a legitimate update event is fired
         static::$restoring = false;
     }
 }