Merge branch '3.x'

app/admin/classes/PermissionManager.php

@@ -74,6 +74,10 @@ public function listGroupedPermissions()
                 $grouped[$group] = [];
             }
 
+            if (isset($permission->group)) {
+                $permission->group = $group;
+            }
+
             $grouped[$group][] = $permission;
         }
 

app/admin/widgets/form/assets/js/form.js

@@ -34,4 +34,4 @@ $(function () {
         $('[data-form-save-action]').attr('name', $selectedAction).attr('value', '1')
         Cookies.set('ti_activeFormSaveAction', JSON.stringify($selectedAction))
     })
-})
+});

app/system/classes/UpdateManager.php

@@ -390,8 +390,7 @@ public function requestUpdateList($force = false)
                 $update['installedVer'] = params('ti_version');
                 if ($this->disableCoreUpdates)
                     continue;
-            }
-            else {
+            } else {
                 if ($this->isMarkedAsIgnored($update['code'])) {
                     $ignoredItems[] = $update;
                     continue;
@@ -516,10 +515,12 @@ public function extractCore($fileCode)
         $configBackup = base_path('/config-backup');
         File::moveDirectory($configDir, $configBackup);
 
-        $result = $this->extractFile($fileCode);
-
-        File::copyDirectory($configBackup, $configDir);
-        File::deleteDirectory($configBackup);
+        try {
+            $result = $this->extractFile($fileCode);
+        } finally {
+            File::copyDirectory($configBackup, $configDir);
+            File::deleteDirectory($configBackup);
+        }
 
         return $result;
     }

app/system/libraries/Country.php

@@ -14,7 +14,7 @@ class Country
     const ISO_CODE_3 = 3;
 
     protected $defaultFormat = [
-        "{address_1}\n{address_2}\n{city} {postcode}\n{state}\n{country}",
+        "{address_1} \n{address_2} \n{city} {postcode}\n{state}\n{country}",
     ];
 
     protected $requiredAddressKeys = [

themes/demo/_pages/home.blade.php

@@ -16,8 +16,8 @@
             <p class="mb-4">Learn more on themes and extension, see the <a href="https://tastyigniter.com/docs/master/customize/themes">Themes documentation</a>.</p>
 
             <p class="mb-4 img-holder">
-                <img class="img-fluid rounded" src="https://tastyigniter.com/assets/ui/images/mockups/Menus-v2.png" alt="TastyIgniter Frontend">
+                <img class="img-fluid rounded" src="https://tastyigniter.com/images/mockups/Menus-v2.png" alt="TastyIgniter Frontend" />
             </p>
         </div>
     </div>
-</div>
+</div>