updater: remove htmlpurifier directory handling

[tt-rss.git] / digest.php

diff --git a/digest.php b/digest.php
index 805e074886fbbbe23652d13c607e3a2db51e7366..7cc174185f5ebc18cf127493811d1ab164d17424 100644 (file)
--- a/digest.php
+++ b/digest.php
@@ -1,6 +1,6 @@
 <?php
-       set_include_path(get_include_path() . PATH_SEPARATOR .
-               dirname(__FILE__) . "/include");
+       set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+               get_include_path());
 
        require_once "functions.php";
        require_once "sessions.php";
@@ -36,11 +36,12 @@
 
        <link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
 
+       <script type="text/javascript" src="lib/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
        <script type="text/javascript" src="lib/prototype.js"></script>
        <script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
-       <script type="text/javascript" src="lib/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
-       <script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
 
+       <script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
+       <script type="text/javascript" charset="utf-8" src="errors.php?mode=js"></script>
        <script type="text/javascript" charset="utf-8" src="js/functions.js?<?php echo $dt_add ?>"></script>
        <script type="text/javascript" src="js/digest.js"></script>
 
@@ -66,21 +67,21 @@
        </div>
 
        <div id="header">
+       <a style="float : left" href="#" onclick="close_article()">
+               <?php echo __("Back to feeds") ?></a>
 
        <div class="links">
-       <?php if (!SINGLE_USER_MODE) { ?>
+
+       <?php if (!$_SESSION["hide_hello"]) { ?>
                        <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
        <?php } ?>
-       <?php if (!SINGLE_USER_MODE) { ?>
+       <?php if (!$_SESSION["hide_logout"]) { ?>
                        <a href="backend.php?op=logout"><?php echo __('Logout') ?></a> |
        <?php } ?>
                        <a href='<?php echo get_self_url_prefix() ?>/index.php?mobile=false'>
                        <?php echo __("Regular version") ?></a>
 
        </div>
-
-       <span class="title">Tiny Tiny RSS</span>
-
        </div>
 
        <div id="article"><div id="article-content">&nbsp;</div></div>