Merge pull request #8226 from nupplaphil/bug/wait_for_conn

[friendica.git] / src / App / Page.php

diff --git a/src/App/Page.php b/src/App/Page.php
index 408f803225f95e6da308095d1bd75a5adbec632b..4b1929a9989e6fa1741a8a54ed4124a28e84101d 100644 (file)
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -8,13 +8,14 @@ use DOMXPath;
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Core\Config\IConfig;
-use Friendica\Core\Config\IPConfiguration;
+use Friendica\Core\PConfig\IPConfig;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Theme;
 use Friendica\Module\Special\HTTPException as ModuleHTTPException;
 use Friendica\Network\HTTPException;
+use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 /**
@@ -151,6 +152,8 @@ class Page implements ArrayAccess
         */
        public function registerStylesheet($path)
        {
+               $path = Network::appendQueryParam($path, ['v' => FRIENDICA_VERSION]);
+
                if (mb_strpos($path, $this->basePath . DIRECTORY_SEPARATOR) === 0) {
                        $path = mb_substr($path, mb_strlen($this->basePath . DIRECTORY_SEPARATOR));
                }
@@ -168,15 +171,15 @@ class Page implements ArrayAccess
         * - Infinite scroll data
         * - head.tpl template
         *
-        * @param App             $app     The Friendica App instance
-        * @param Module          $module  The loaded Friendica module
-        * @param L10n            $l10n    The l10n language instance
-        * @param IConfig         $config  The Friendica configuration
-        * @param IPConfiguration $pConfig The Friendica personal configuration (for user)
+        * @param App      $app     The Friendica App instance
+        * @param Module   $module  The loaded Friendica module
+        * @param L10n     $l10n    The l10n language instance
+        * @param IConfig  $config  The Friendica configuration
+        * @param IPConfig $pConfig The Friendica personal configuration (for user)
         *
         * @throws HTTPException\InternalServerErrorException
         */
-       private function initHead(App $app, Module $module, L10n $l10n, IConfig $config, IPConfiguration $pConfig)
+       private function initHead(App $app, Module $module, L10n $l10n, IConfig $config, IPConfig $pConfig)
        {
                $interval = ((local_user()) ? $pConfig->get(local_user(), 'system', 'update_interval') : 40000);
 
@@ -334,6 +337,8 @@ class Page implements ArrayAccess
         */
        public function registerFooterScript($path)
        {
+               $path = Network::appendQueryParam($path, ['v' => FRIENDICA_VERSION]);
+
                $url = str_replace($this->basePath . DIRECTORY_SEPARATOR, '', $path);
 
                $this->footerScripts[] = trim($url, '/');
@@ -342,17 +347,17 @@ class Page implements ArrayAccess
        /**
         * Executes the creation of the current page and prints it to the screen
         *
-        * @param App             $app     The Friendica App
-        * @param BaseURL         $baseURL The Friendica Base URL
-        * @param Mode            $mode    The current node mode
-        * @param Module          $module  The loaded Friendica module
-        * @param L10n            $l10n    The l10n language class
-        * @param IConfig         $config  The Configuration of this node
-        * @param IPConfiguration $pconfig The personal/user configuration
+        * @param App      $app     The Friendica App
+        * @param BaseURL  $baseURL The Friendica Base URL
+        * @param Mode     $mode    The current node mode
+        * @param Module   $module  The loaded Friendica module
+        * @param L10n     $l10n    The l10n language class
+        * @param IConfig  $config  The Configuration of this node
+        * @param IPConfig $pconfig The personal/user configuration
         *
         * @throws HTTPException\InternalServerErrorException
         */
-       public function run(App $app, BaseURL $baseURL, Mode $mode, Module $module, L10n $l10n, IConfig $config, IPConfiguration $pconfig)
+       public function run(App $app, BaseURL $baseURL, Mode $mode, Module $module, L10n $l10n, IConfig $config, IPConfig $pconfig)
        {
                $moduleName = $module->getName();