fix help not loading on ? press

[tt-rss.git] / prefs.php

diff --git a/prefs.php b/prefs.php
index 98e4a2fd94b850ee2e017ac288990cdea1d7cde2..21a72cfd1cadaeb027448e6d030077bdf10731df 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -1,4 +1,7 @@
 <?php
+       set_include_path(get_include_path() . PATH_SEPARATOR . 
+               dirname(__FILE__) . "/include");
+
        require_once "functions.php";
        require_once "sessions.php";
        require_once "sanity_check.php";
@@ -8,7 +11,7 @@
 
        $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
 
-       init_connection($link);
+       if (!init_connection($link)) return;
 
        login_sequence($link);
 
@@ -41,10 +44,9 @@
 
        <script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
 
-       <script type="text/javascript" charset="utf-8" src="functions.js?<?php echo $dt_add ?>"></script>
-       <script type="text/javascript" charset="utf-8" src="deprecated.js?<?php echo $dt_add ?>"></script>
-
-       <script type="text/javascript" charset="utf-8" src="prefs.js?<?php echo $dt_add ?>"></script>
+       <script type="text/javascript" charset="utf-8" src="js/functions.js?<?php echo $dt_add ?>"></script>
+       <script type="text/javascript" charset="utf-8" src="js/deprecated.js?<?php echo $dt_add ?>"></script>
+       <script type="text/javascript" charset="utf-8" src="js/prefs.js?<?php echo $dt_add ?>"></script>
 
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
@@ -71,14 +73,12 @@
        </div>
 </div>
 
-<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
-       <?php include "help/4.php" ?>
-</div>
+<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)"></div>
 
 <img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/>
 
 <div id="header" dojoType="dijit.layout.ContentPane" region="top">
-       <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a> |
+       <a href='#' onclick="showHelp()"><?php echo __("Keyboard shortcuts") ?></a> |
        <a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a>
 </div>