public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-16 07:05:56 +00:00
Code Issues Releases Wiki Activity

new option: ALLOW_SELECT_UPDATE_METHOD (bump config ver)

Browse Source
This commit is contained in:
Andrew Dolgov
2008-01-25 18:50:29 +01:00
parent 16211ddbf2
commit 34459667e2
4 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config.php-dist
View File

@@ -174,7 +174,11 @@
// Directory for lockfiles, must be writable to the user you run // Directory for lockfiles, must be writable to the user you run
// daemon process or cronjobs under. // daemon process or cronjobs under.
define('CONFIG_VERSION', 14); define('ALLOW_SELECT_UPDATE_METHOD', false);
// Allow users to select the library to update feeds with - e.g.
// Magpie or SimplePie
define('CONFIG_VERSION', 15);
// Expected config version. Please update this option in config.php // Expected config version. Please update this option in config.php
// if necessary (after migrating all new options from this file). // if necessary (after migrating all new options from this file).

10
functions.php
View File

@@ -501,10 +501,14 @@
$auth_login = db_fetch_result($result, 0, "auth_login"); $auth_login = db_fetch_result($result, 0, "auth_login");
$auth_pass = db_fetch_result($result, 0, "auth_pass"); $auth_pass = db_fetch_result($result, 0, "auth_pass");
if (ENABLE_SIMPLEPIE) { if (ALLOW_SELECT_UPDATE_METHOD) {
$use_simplepie = $update_method != 1; if (ENABLE_SIMPLEPIE) {
$use_simplepie = $update_method != 1;
} else {
$use_simplepie = $update_method == 2;
}
} else { } else {
$use_simplepie = $update_method == 2; $use_simplepie = ENABLE_SIMPLEPIE;
} }
if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) { if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {

21
modules/pref-feeds.php
View File

@@ -260,16 +260,19 @@
print "</td>"; print "</td>";
$update_method = db_fetch_result($result, 0, "update_method"); if (ALLOW_SELECT_UPDATE_METHOD) {
print "<tr><td>".__('Update using:')."</td>"; $update_method = db_fetch_result($result, 0, "update_method");
print "<td>"; print "<tr><td>".__('Update using:')."</td>";
print_select_hash("update_method", $update_method, $update_methods, print "<td>";
"class=\"iedit\"");
print_select_hash("update_method", $update_method, $update_methods,
print "</td>"; "class=\"iedit\"");
print "</td>";
}
$auth_login = htmlspecialchars(db_fetch_result($result, 0, "auth_login")); $auth_login = htmlspecialchars(db_fetch_result($result, 0, "auth_login"));

2
sanity_check.php
View File

@@ -1,7 +1,7 @@
<?php <?php
require_once "functions.php"; require_once "functions.php";
define('EXPECTED_CONFIG_VERSION', 14); define('EXPECTED_CONFIG_VERSION', 15);
define('SCHEMA_VERSION', 31); define('SCHEMA_VERSION', 31);
if (!file_exists("config.php")) { if (!file_exists("config.php")) {