Merge branch 'master' of tsia/tt-rss into master

[tt-rss.git] / prefs.php

diff --git a/prefs.php b/prefs.php
index 16b1dd0eb25f3428532bb11d56509f4ce04ea42e..89e5f4c2a6051a0ecd7a3eaf4e269f814c9e370c 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -44,7 +44,7 @@
                if ($theme && theme_valid("$theme")) {
                        echo stylesheet_tag(get_theme_path($theme));
                } else {
-                       echo stylesheet_tag("themes/default.php");
+                       echo stylesheet_tag("css/default.css");
                }
        }
        ?>
@@ -77,10 +77,16 @@
        } ?>
 
        <script type="text/javascript">
+               'use strict';
                require({cache:{}});
        <?php
                require_once 'lib/jshrink/Minifier.php';
 
+               print get_minified_js(["functions.js", "prefs.js"]);
+       ?>
+       </script>
+       <script type="text/javascript">
+       <?php
                foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
                        if (method_exists($p, "get_prefs_js")) {
                                echo "try {";
@@ -92,8 +98,6 @@
                        }
                }
 
-               print get_minified_js(array("functions", "deprecated", "prefs"));
-
                init_js_translations();
        ?>
        </script>