Remove locked property from composer.json manifest

Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com>
tastyigniter · May 10, 2022 · be92fda · be92fda
1 parent 8678fc6
commit be92fda
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/main/classes/ThemeManager.php b/app/main/classes/ThemeManager.php
@@ -729,7 +729,7 @@ protected function writeChildThemeMetaFile($path, $parentTheme, $themeConfig)
             $composer = json_decode(File::get($metaPath), true) ?? [];
 
             $composer['extra']['tastyigniter-theme'] = array_merge(
-                $composer['extra']['tastyigniter-theme'],
+                array_except($composer['extra']['tastyigniter-theme'], ['locked']),
                 array_except($config, ['description'])
             );
 

diff --git a/app/main/formwidgets/TemplateEditor.php b/app/main/formwidgets/TemplateEditor.php
@@ -162,6 +162,9 @@ public function onSaveSource()
         if ($this->manager->isLocked($this->model->code))
             throw new ApplicationException(lang('system::lang.themes.alert_theme_locked'));
 
+        if (!$this->templateWidget)
+            return;
+
         $fileName = sprintf('%s/%s', $this->templateType, $this->templateFile);
         $data = post('Theme.source');
 
@@ -261,6 +264,9 @@ protected function wasTemplateModified()
 
     protected function getTemplateModifiedTime()
     {
+        if (!$this->templateWidget)
+            return null;
+
         return optional($this->templateWidget->data)->fileSource->mTime;
     }
 }