Merge branch 'master' into css-feedtree-counter

[tt-rss.git] / prefs.php
diff --git a/prefs.php b/prefs.php

index 826728315ea3c994ffe912815efc55394b02ceda..b617d94bc917e754b771d7f374c012ed921a9fe0 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -32,14 +32,14 @@
  <head>
         <title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title>
  
-       <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
-       <?php echo stylesheet_tag("tt-rss.css"); ?>
-       <?php echo stylesheet_tag("prefs.css"); ?>
+       <?php stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
+       <?php stylesheet_tag("tt-rss.css"); ?>
+       <?php stylesheet_tag("prefs.css"); ?>
  
         <?php if ($_SESSION["uid"]) {
                 $theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
                 if ($theme) {
-                       echo stylesheet_tag("themes/$theme");
+                       stylesheet_tag("themes/$theme");
                 }
         }
         ?>
@@ -58,7 +58,7 @@
                                 "lib/dojo/tt-rss-layer.js",
                                 "errors.php?mode=js") as $jsfile) {
  
-               echo javascript_tag($jsfile);
+               javascript_tag($jsfile);
  
         } ?>
  
@@ -66,9 +66,7 @@
         <?php
                 require 'lib/jshrink/Minifier.php';
  
-               global $pluginhost;
-
-               foreach ($pluginhost->get_plugins() as $n => $p) {
+               foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
                         if (method_exists($p, "get_prefs_js")) {
                                 echo JShrink\Minifier::minify($p->get_prefs_js());
                         }
@@ -134,7 +132,7 @@
                 title="<?php echo __('System') ?>"></div>
  <?php } ?>
  <?php
-       $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TABS,
+       PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TABS,
                 "hook_prefs_tabs", false);
  ?>
  </div>