public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-08 17:09:15 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

Browse Source
This commit is contained in:
Andrew Dolgov
2013-04-04 13:21:11 +04:00
parent 5929a0c1e4 810205625b
commit e6cdbaec9f
43 changed files with 4098 additions and 4125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions.php
View File

@@ -318,7 +318,7 @@
global $fetch_last_error;
global $fetch_last_error_code;
if (!defined('NO_CURL') && !function_exists('curl_init') && !ini_get("open_basedir")) {
if (!defined('NO_CURL') && function_exists('curl_init') && !ini_get("open_basedir")) {
if (ini_get("safe_mode")) {
$ch = curl_init(geturl($url));
@@ -630,6 +630,7 @@
@session_start();
$_SESSION["uid"] = $user_id;
$_SESSION["version"] = VERSION;
$result = db_query($link, "SELECT login,access_level,pwd_hash FROM ttrss_users
WHERE id = '$user_id'");
@@ -2412,6 +2413,7 @@
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
} else if ($feed == -4) { // all articles virtual feed
$allow_archived = true;
$query_strategy_part = "true";
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
} else if ($feed <= LABEL_BASE_INDEX) { // labels

3
include/sessions.php
View File

@@ -5,6 +5,7 @@
require_once "db.php";
require_once "lib/accept-to-gettext.php";
require_once "lib/gettext/gettext.inc";
require_once "version.php";
$session_expire = max(SESSION_COOKIE_LIFETIME, 86400);
$session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME;
@@ -38,6 +39,8 @@
if (SINGLE_USER_MODE) return true;
if (!$link) return false;
if (VERSION != $_SESSION["version"]) return false;
$check_ip = $_SESSION['ip_address'];
switch (SESSION_CHECK_ADDRESS) {

2
include/version.php
View File

@@ -1,3 +1,3 @@
<?php
define('VERSION', "1.7.6");
define('VERSION', "1.7.8");
?>