summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2006-03-31 06:30:20 +0100
committerAndrew Dolgov <[email protected]>2006-03-31 06:30:20 +0100
commit9a3bb96a8700c60235dc27406e32d8affdc1c106 (patch)
tree3159e1408ea3ceae13aee2e1429e09863d5bffb4
parent5854b0164d3138d1821fd8374655d30df8a30440 (diff)
remove stupid DISABLE_SESSIONS kludge, check if constant is defined, not true
-rw-r--r--backend.php2
-rw-r--r--config.php-dist4
-rw-r--r--db-prefs.php2
-rw-r--r--tt-rss.css1
4 files changed, 2 insertions, 7 deletions
diff --git a/backend.php b/backend.php
index f073dc9a3..a9f79667b 100644
--- a/backend.php
+++ b/backend.php
@@ -3913,7 +3913,7 @@
"SESSION_COOKIE_LIFETIME_REMEMBER";
}
- if (defined('DISABLE_SESSIONS') && DISABLE_SESSIONS) {
+ if (defined('DISABLE_SESSIONS')) {
return "config: you have enabled DISABLE_SESSIONS. Please disable this option.";
}
diff --git a/config.php-dist b/config.php-dist
index 5344e11d0..e72e52911 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -91,13 +91,9 @@
define('ENABLE_UPDATE_DAEMON', false);
// This enables different mechanism for user-triggered updates designed
// for update daemon running in background on the server.
-
// This option suggests FEEDS_FRAME_REFRESH set to a small value
// (like 60 seconds, depending on number of users and server/bandwidth load).
- define('DISABLE_SESSIONS', false);
- // Never enable this option (kludge for daemon using tt-rss code)
-
define('DAEMON_SLEEP_INTERVAL', 120);
// Interval between update daemon update runs
diff --git a/db-prefs.php b/db-prefs.php
index 0309f00a0..e9aaee304 100644
--- a/db-prefs.php
+++ b/db-prefs.php
@@ -2,7 +2,7 @@
require_once "config.php";
require_once "db.php";
- if (! DISABLE_SESSIONS) {
+ if (!defined('DISABLE_SESSIONS')) {
if (!$_SESSION["prefs_cache"])
$_SESSION["prefs_cache"] = array();
}
diff --git a/tt-rss.css b/tt-rss.css
index be1f5cb88..edbb31161 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1073,7 +1073,6 @@ div.cdmContent a:hover {
#fatal_error_msg {
border : 1px solid #c0c0c0;
background-color : #f0f0f0;
- width : 50%;
color : black;
padding : 10px;
font-weight : normal;