Merge pull request #101 from bvipul/master

Solved count error in EloquentHistoryRepository

Merge pull request #101 from bvipul/master
Solved count error in EloquentHistoryRepository
563f7b35 · Viral Solani · GitHub · b0495043 · a8af7c94 · 563f7b35
Unverified Commit 563f7b35 authored Dec 24, 2017 by Viral Solani Committed by GitHub Dec 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

EloquentHistoryRepository.php ...epositories/Backend/History/EloquentHistoryRepository.php +8 -2

No files found.
--- a/app/Repositories/Backend/History/EloquentHistoryRepository.php
+++ b/app/Repositories/Backend/History/EloquentHistoryRepository.php
@@ -224,9 +224,15 @@ class EloquentHistoryRepository implements HistoryContract
    {
        $assets = json_decode($assets, true);
        $count = 1;
-        $asset_count = count($assets) + 1;
+        $asset_count = 1;
+        $flag = false;

-        if (count($assets)) {
+        if(is_array($assets) || $assets instanceof \Countable) {
+            $asset_count = count($assets) + 1;
+            $flag = true;
+        }
+
+        if ($flag) {
            foreach ($assets as $name => $values) {
                $key = explode('_', $name)[0];
                $type = explode('_', $name)[1];