diff --git a/.idea/php.xml b/.idea/php.xml
index 4493a6d..a8e1ca9 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -5,4 +5,5 @@
+
\ No newline at end of file
diff --git a/CHANGELOG b/CHANGELOG
index b701e27..d39dfa8 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 2.6.0
+==================================================
+- Add support for multi sites
+
Version 2.5.0
==================================================
- V9 compatible
diff --git a/Gruntfile.js b/Gruntfile.js
index dd15aca..b354d6b 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -61,6 +61,7 @@ module.exports = function (grunt) {
{src: ['routes/**'], dest: "dist/"},
{src: ['single_pages/**'], dest: "dist/"},
{src: ['src/**'], dest: "dist/"},
+ {src: ['views/**'], dest: "dist/"},
{src: ['languages/**'], dest: "dist/"},
{src: ['icon.png'], dest: "dist/"},
{src: ['CHANGELOG'], dest: "dist/"}
diff --git a/controller.php b/controller.php
index af8215b..0d76d6f 100755
--- a/controller.php
+++ b/controller.php
@@ -16,7 +16,7 @@
class Controller extends Package
{
protected $pkgHandle = 'app_icon';
- protected $pkgVersion = '2.5.0';
+ protected $pkgVersion = '2.6.0';
protected $appVersionRequired = '9.0.0';
protected $pkgAutoloaderRegistries = [
'src/Bitter/AppIcon' => 'Bitter\AppIcon',
diff --git a/controllers/dialog/support/create_ticket.php b/controllers/dialog/support/create_ticket.php
index b2481b6..ec556b2 100644
--- a/controllers/dialog/support/create_ticket.php
+++ b/controllers/dialog/support/create_ticket.php
@@ -45,10 +45,9 @@ public function submit()
$rawData = $response->getBody()->getContents();
- /** @noinspection PhpComposerExtensionStubsInspection */
$json = json_decode($rawData, true);
- if ($json["error"]) {
+ if (isset($json["error"])) {
foreach ($json["errors"] as $errorMessage) {
$errorList->add($errorMessage);
}
diff --git a/controllers/single_page/dashboard/system/app_icon.php b/controllers/single_page/dashboard/system/app_icon.php
index 67bca6b..ec12797 100755
--- a/controllers/single_page/dashboard/system/app_icon.php
+++ b/controllers/single_page/dashboard/system/app_icon.php
@@ -10,23 +10,20 @@
namespace Concrete\Package\AppIcon\Controller\SinglePage\Dashboard\System;
-use Concrete\Core\Page\Controller\DashboardPageController;
-use Bitter\AppIcon\Settings;
+use Concrete\Core\Page\Controller\DashboardSitePageController;
/** @noinspection PhpUnused */
-class AppIcon extends DashboardPageController
+class AppIcon extends DashboardSitePageController
{
public function view()
{
- /** @var Settings $settings */
- $settings = $this->app->make(Settings::class);
+ $config = $this->getSite()->getConfigRepository();
- /** @noinspection PhpUndefinedMethodInspection */
if ($this->request->getMethod() === "POST") {
- $settings->setAppIconFileId($this->post("appIcon"));
+ $config->save("settings.app_icon_file_id", (int)$this->request->request->get("appIcon", 0));
}
- $this->set("appIcon", $settings->getAppIconFile());
+ $this->set("appIcon", $config->get("settings.app_icon_file_id"));
}
}
diff --git a/single_pages/dashboard/system/app_icon.php b/single_pages/dashboard/system/app_icon.php
index 03f1841..0da62a8 100755
--- a/single_pages/dashboard/system/app_icon.php
+++ b/single_pages/dashboard/system/app_icon.php
@@ -14,7 +14,7 @@
use Concrete\Core\Entity\File\File;
use Concrete\Core\Form\Service\Form;
use Concrete\Core\Support\Facade\Application;
-use Concrete\Core\View\View;
+use Concrete\Core\Support\Facade\Url;
/** @var File $appIcon */
@@ -26,6 +26,27 @@
?>
+
+
+
+
+