Merge branch 'master' of git.tt-rss.org:fox/tt-rss

[tt-rss.git] / index.php

diff --git a/index.php b/index.php
index daa532aa23dfd5a35f60cfe289afa562aaf78b18..f3e5928dd65c3d6e7b6f6a8bcc38818e31441838 100644 (file)
--- a/index.php
+++ b/index.php
@@ -11,8 +11,8 @@
 
        // we need a separate check here because functions.php might get parsed
        // incorrectly before 5.3 because of :: syntax.
-       if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-               print "<b>Fatal Error</b>: PHP version 5.3.0 or newer required.\n";
+       if (version_compare(PHP_VERSION, '5.6.0', '<')) {
+               print "<b>Fatal Error</b>: PHP version 5.6.0 or newer required. You're using " . PHP_VERSION . ".\n";
                exit;
        }
 
@@ -64,7 +64,7 @@
        <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
 
        <?php if ($_SESSION["uid"]) {
-               $theme = get_pref( "USER_CSS_THEME", $_SESSION["uid"], false);
+               $theme = get_pref("USER_CSS_THEME", false, false);
                if ($theme && theme_valid("$theme")) {
                        echo stylesheet_tag(get_theme_path($theme));
                } else {
@@ -110,13 +110,15 @@
        } ?>
 
        <script type="text/javascript">
+               'use strict';
                require({cache:{}});
        <?php
-               require_once 'lib/jshrink/Minifier.php';
-
-               print get_minified_js(array("tt-rss",
-                       "functions", "feedlist", "viewfeed", "PluginHost"));
-
+               print get_minified_js(["tt-rss.js",
+                       "functions.js", "feedlist.js", "viewfeed.js", "PluginHost.js"]);
+       ?>
+       </script>
+       <script type="text/javascript">
+       <?php
                foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
                        if (method_exists($p, "get_js")) {
                                echo "try {";