From 3de78afd3bc9b01da3a03391dc566430b490886c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 24 Oct 2012 00:25:56 +0400
Subject: [PATCH] fix called-from-browser detection in update.php
---
update.php | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/update.php b/update.php
index afe70b903..6e23892e2 100755
--- a/update.php
+++ b/update.php
@@ -15,30 +15,30 @@
require_once "db-prefs.php";
require_once "update_self.php";
- if (!defined('STDIN')) {
+ if (!defined('PHP_EXECUTABLE'))
+ define('PHP_EXECUTABLE', '/usr/bin/php');
+
+ $op = $argv;
+
+ if (count($argv) == 0 && !defined('STDIN')) {
?> <html>
<head>
- <title>Update Tool</title>
+ <title>Tiny Tiny RSS data update script.</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="utility.css">
</head>
<body>
<div class="floatingLogo"><img src="images/logo_wide.png"></div>
- <h1><?php echo __("Update") ?></h1>
+ <h1><?php echo __("Tiny Tiny RSS data update script.") ?></h1>
- <?php print_error("Please run this script from the command line."); ?>
+ <?php print_error("Please run this script from the command line. Use option \"-help\" to display command help if this error is displayed erroneously."); ?>
</body></html>
<?php
exit;
}
- if (!defined('PHP_EXECUTABLE'))
- define('PHP_EXECUTABLE', '/usr/bin/php');
-
- $op = $argv;
-
if (count($argv) == 1 || in_array("-help", $op) ) {
print "Tiny Tiny RSS data update script.\n\n";
print "Options:\n";
--
GitLab