Merge branch 'feature/php-version-check-and-link-stuff' into 'master'

Remove extra PHP version checks, fix some links

See merge request tt-rss/tt-rss!54

5 files changed, 9 insertions, 26 deletions

diff --git a/classes/Config.php b/classes/Config.php
index d28a259c9..a1886e877 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -665,8 +665,8 @@ class Config {
 
 						<?php foreach ($errors as $error) { echo self::format_error($error); } ?>
 
-						<p>You might want to check tt-rss <a target="_blank" href="https://tt-rss.org/wiki.php">wiki</a> or the
-							<a target="_blank" href="https://community.tt-rss.org/">forums</a> for more information. Please search the forums before creating new topic
+						<p>You might want to check the tt-rss <a target="_blank" href="https://tt-rss.org/wiki/InstallationNotes/">wiki</a> or
+							<a target="_blank" href="https://community.tt-rss.org/">forums</a> for more information. Please search the forums before creating a new topic
 							for your question.</p>
 					</div>
 				</body>
@@ -681,8 +681,8 @@ class Config {
 				echo " * " . strip_tags($error)."\n";
 			}
 
-			echo "\nYou might want to check tt-rss wiki or the forums for more information.\n";
-			echo "Please search the forums before creating new topic for your question.\n";
+			echo "\nYou might want to check the tt-rss wiki or forums for more information.\n";
+			echo "Please search the forums before creating a new topic for your question.\n";
 
 			exit(1);
 		}
diff --git a/classes/Pref_Prefs.php b/classes/Pref_Prefs.php
index 2bd9ae0bd..dd28bd3f2 100644
--- a/classes/Pref_Prefs.php
+++ b/classes/Pref_Prefs.php
@@ -655,7 +655,7 @@ class Pref_Prefs extends Handler_Protected {
 						<?= \Controls\button_tag(\Controls\icon("palette") . " " . __("Customize"), "",
 								["onclick" => "Helpers.Prefs.customizeCSS()"]) ?>
 						<?= \Controls\button_tag(\Controls\icon("open_in_new") . " " . __("More themes..."), "",
-								["class" => "alt-info", "onclick" => "window.open(\"https://tt-rss.org/wiki/Themes\")"]) ?>
+								["class" => "alt-info", "onclick" => "window.open(\"https://tt-rss.org/Themes/\")"]) ?>
 
 						<?php
 
@@ -898,7 +898,7 @@ class Pref_Prefs extends Handler_Protected {
 				</div>
 				<div dojoType="dijit.layout.ContentPane" region="bottom">
 
-					<button dojoType='dijit.form.Button' class="alt-info pull-right" onclick='window.open("https://tt-rss.org/wiki/Plugins")'>
+					<button dojoType='dijit.form.Button' class="alt-info pull-right" onclick='window.open("https://tt-rss.org/Plugins/")'>
 						<i class='material-icons'>help</i>
 						<?= __("More info") ?>
 					</button>
diff --git a/include/functions.php b/include/functions.php
index 2d3dd6d1e..c32924743 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -352,7 +352,7 @@
 	}
 
 	/** Convert values accepted by tt-rss as true/false to PHP booleans
-	 * @see https://tt-rss.org/wiki/ApiReference#boolean-values
+	 * @see https://tt-rss.org/ApiReference/#boolean-values
 	 * @param null|string $s null values are considered false
 	 * @return bool
 	 */
diff --git a/index.php b/index.php
index 811422d20..a2a6d2373 100644
--- a/index.php
+++ b/index.php
@@ -1,14 +1,5 @@
 <?php
-
-	// we need a separate check here because functions.php might get parsed
-	// incorrectly before 5.3 because of :: syntax.
-	if (version_compare(PHP_VERSION, '7.4.0', '<')) {
-		print "<b>Fatal Error</b>: PHP version 7.4.0 or newer required. You're using " . PHP_VERSION . ".\n";
-		exit;
-	}
-
-	set_include_path(__DIR__ ."/include" . PATH_SEPARATOR .
-		get_include_path());
+	set_include_path(__DIR__ . "/include" . PATH_SEPARATOR . get_include_path());
 
 	require_once "autoload.php";
 	require_once "sessions.php";
diff --git a/prefs.php b/prefs.php
index 83b620bc6..f1c7a0fa7 100644
--- a/prefs.php
+++ b/prefs.php
@@ -1,13 +1,5 @@
 <?php
-	// we need a separate check here because functions.php might get parsed
-	// incorrectly before 5.3 because of :: syntax.
-	if (version_compare(PHP_VERSION, '7.4.0', '<')) {
-		print "<b>Fatal Error</b>: PHP version 7.4.0 or newer required. You're using " . PHP_VERSION . ".\n";
-		exit;
-	}
-
-	set_include_path(__DIR__ ."/include" . PATH_SEPARATOR .
-		get_include_path());
+	set_include_path(__DIR__ . "/include" . PATH_SEPARATOR . get_include_path());
 
 	require_once "autoload.php";
 	require_once "sessions.php";