mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 05:20:56 +02:00
Code Issues Releases Wiki Activity

[ticket/16944] Fix path and update iconify bundle

Browse Source 
PHPBB3-16944
This commit is contained in:
Marc Alexander
2023-08-15 09:50:19 +02:00
parent a1b41f25ef
commit bd6cd8f2fc
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/assets/iconify/iconify-bundle.js
View File

File diff suppressed because one or more lines are too long

9
phpBB/phpbb/assets/iconify_bundler.php
View File

@@ -19,7 +19,7 @@ use Symfony\Component\Finder\Finder;
class iconify_bundler class iconify_bundler
{ {
protected const BUNDLE_PATH = 'assets/iconify/iconify_bundle.js'; protected const BUNDLE_PATH = 'assets/iconify/iconify-bundle.js';
protected $db; protected $db;
@@ -83,6 +83,11 @@ class iconify_bundler
return file_get_contents($this->bundle_path); return file_get_contents($this->bundle_path);
} }
return $this->create_bundle();
}
public function create_bundle(): string
{
$iconify_bundle = $this->with_extensions() $iconify_bundle = $this->with_extensions()
->with_styles() ->with_styles()
->run(); ->run();
@@ -187,7 +192,7 @@ class iconify_bundler
return $this; return $this;
} }
protected function is_dumped(): bool public function is_dumped(): bool
{ {
return $this->filesystem->exists($this->bundle_path) && $this->filesystem->is_readable($this->bundle_path); return $this->filesystem->exists($this->bundle_path) && $this->filesystem->is_readable($this->bundle_path);
} }

4
phpBB/styles/prosilver/template/overall_footer.html
View File

@@ -76,8 +76,8 @@
<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> <script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
<!-- INCLUDEJS forum_fn.js --> <!-- INCLUDEJS forum_fn.js -->
<!-- INCLUDEJS ajax.js --> <!-- INCLUDEJS ajax.js -->
<script src="{{ T_ASSETS_PATH ~ '/iconify/iconify-bundle.js?assets_version=' ~ T_ASSETS_VERSION }}"></script> {% INCLUDEJS T_ASSETS_PATH ~ '/iconify/iconify-bundle.js' %}
<script src="{T_ASSETS_PATH}/iconify/iconify.min.js?assets_version={T_ASSETS_VERSION}"></script> {% INCLUDEJS T_ASSETS_PATH ~ '/iconify/iconify.min.js' %}
<!-- IF S_COOKIE_NOTICE --> <!-- IF S_COOKIE_NOTICE -->
<script src="{T_ASSETS_PATH}/cookieconsent/cookieconsent.min.js?assets_version={T_ASSETS_VERSION}"></script> <script src="{T_ASSETS_PATH}/cookieconsent/cookieconsent.min.js?assets_version={T_ASSETS_VERSION}"></script>