Remove deprecated App::registerStylesheet()/FooterScript() - replace with DI::page...

diff --git a/cookienotice/cookienotice.php b/cookienotice/cookienotice.php
index 097f3c25ce2b5a8424614b63d62dc0d988d7861b..bad867e790cd56ef8596d79fafc4685ae900c1b5 100644 (file)
--- a/cookienotice/cookienotice.php
+++ b/cookienotice/cookienotice.php
@@ -12,6 +12,7 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 
 /**
  * cookienotice_install
@@ -90,8 +91,8 @@ function cookienotice_page_content_top(App $a, &$b)
        $stylesheetPath = __DIR__ . '/cookienotice.css';
        $footerscriptPath = __DIR__ . '/cookienotice.js';
 
-       $a->registerStylesheet($stylesheetPath);
-       $a->registerFooterScript($footerscriptPath);
+       DI::page()->registerStylesheet($stylesheetPath);
+       DI::page()->registerFooterScript($footerscriptPath);
 }
 
 /**

diff --git a/geonames/geonames.php b/geonames/geonames.php
index c052cef6bea1187db9e080e19ee5601b976f8197..03a2e45be2c70c2a532fe317ad6d0ad1cf993e0e 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -13,6 +13,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
@@ -136,7 +137,7 @@ function geonames_addon_settings(App $a, &$s)
 
        /* Add our stylesheet to the page so we can make our settings look nice */
        $stylesheetPath = __DIR__ . '/geonames.css';
-       $a->registerStylesheet($stylesheetPath);
+       DI::page()->registerStylesheet($stylesheetPath);
 
        /* Get the current state of our config variable */
        $enabled = intval(PConfig::get(local_user(), 'geonames', 'enable'));

diff --git a/highlightjs/highlightjs.php b/highlightjs/highlightjs.php
index 258cb4ad156f0ca29cafcfc79db39b0c5514eb30..823541bb458aee6d3546f7f619168a607436ab0f 100644 (file)
--- a/highlightjs/highlightjs.php
+++ b/highlightjs/highlightjs.php
@@ -8,6 +8,7 @@
 
 use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\DI;
 
 function highlightjs_install()
 {
@@ -29,11 +30,11 @@ function highlightjs_head(App $a, &$b)
                $style = 'default';
        }
 
-       $a->registerStylesheet(__DIR__ . '/asset/styles/' . $style . '.css');
+       DI::page()->registerStylesheet(__DIR__ . '/asset/styles/' . $style . '.css');
 }
 
 function highlightjs_footer(App $a, &$b)
 {
-       $a->registerFooterScript(__DIR__ . '/asset/highlight.pack.js');
-       $a->registerFooterScript(__DIR__ . '/highlightjs.js');
+       DI::page()->registerFooterScript(__DIR__ . '/asset/highlight.pack.js');
+       DI::page()->registerFooterScript(__DIR__ . '/highlightjs.js');
 }

diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php
index 6e80d68f6f987984cd57e6f44b5f5950fb79cdb3..2974f762d5306971af0b5386ca6b1daf16cea8b1 100644 (file)
--- a/mathjax/mathjax.php
+++ b/mathjax/mathjax.php
@@ -13,6 +13,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 
 function mathjax_install()
 {
@@ -64,7 +65,7 @@ function mathjax_footer(App $a, &$b)
        //  if the visitor of the page is not a local_user, use MathJax
        //  otherwise check the users settings.
        if (!local_user() || PConfig::get(local_user(), 'mathjax', 'use', false)) {
-               $a->registerFooterScript(__DIR__ . '/asset/MathJax.js?config=TeX-MML-AM_CHTML');
-               $a->registerFooterScript(__DIR__ . '/mathjax.js');
+               DI::page()->registerFooterScript(__DIR__ . '/asset/MathJax.js?config=TeX-MML-AM_CHTML');
+               DI::page()->registerFooterScript(__DIR__ . '/mathjax.js');
        }
 }

diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index fd07fc1dec2392c73127b667e1f650d5338fff09..1a7fb4eb601b0bafba7ed786894ef912bece11e9 100644 (file)
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -13,6 +13,7 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 
 function pageheader_install() {
     Hook::register('page_content_top', __FILE__, 'pageheader_fetch');
@@ -26,7 +27,7 @@ function pageheader_addon_admin(App &$a, &$s)
 
     /* Add our stylesheet to the page so we can make our settings look nice */
        $stylesheetPath = __DIR__ . '/pageheader.css';
-       $a->registerStylesheet($stylesheetPath);
+       DI::page()->registerStylesheet($stylesheetPath);
 
        $words = Config::get('pageheader','text');
        if(! $words)
@@ -65,7 +66,7 @@ function pageheader_fetch(App $a, &$b)
        }
 
        $stylesheetPath = __DIR__ .'/pageheader.css';
-       $a->registerStylesheet($stylesheetPath);
+       DI::page()->registerStylesheet($stylesheetPath);
     
     if ($s) {
         $b .= '<div class="pageheader">' . $s . '</div>';