From b1715e644ee7cebe5f6a1f1008b36c618cf90781 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Tue, 1 Nov 2011 14:05:53 +0000
Subject: [PATCH] bug 32100 installer complains about suhosin GET limit

Our logic was to warn whenever the suhosin GET limit was set.
This patch skip the warning if the limit is 1024 or more.

Also added 'qqq' message for 'config-suhosin-max-value-length'
---
 RELEASE-NOTES-1.18                    | 2 ++
 includes/installer/Installer.i18n.php | 1 +
 includes/installer/Installer.php      | 5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18
index ded58d1efd..97668227f4 100644
--- a/RELEASE-NOTES-1.18
+++ b/RELEASE-NOTES-1.18
@@ -474,6 +474,8 @@ create a page or new section.
 * (bug 30466) Entries in iwlinks table are now cleared when moving a page over
   redirect
 * (bug 31674) Can't edit watchlist if it contains special pages
+* (bug 32100) Installer complains about Suhosin GET limit even if it is
+  already set above 1024 bytes
 
 === API changes in 1.18 ===
 * BREAKING CHANGE: action=watch now requires POST and token.
diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index 5815d8d36d..10581efec1 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -640,6 +640,7 @@ Parameters:
 	'config-admin-password' => '{{Identical|Password}}',
 	'config-admin-email' => '{{Identical|E-mail address}}',
 	'config-subscribe' => 'Used as label for the installer checkbox',
+	'config-suhosin-max-value-length' => 'Message shown when PHP parameter suhosin.get.max_value_length is between 0 and 1023 (that max value is hard set in MediaWiki software',
 	'config-profile-help' => 'Messages referenced:
 * {{msg-mw|config-profile-wiki}}
 * {{msg-mw|config-profile-no-anon}}
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index a1b526584c..7b6828333d 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -981,7 +981,10 @@ abstract class Installer {
 	protected function envCheckSuhosinMaxValueLength() {
 		$maxValueLength = ini_get( 'suhosin.get.max_value_length' );
 		if ( $maxValueLength > 0 ) {
-			$this->showMessage( 'config-suhosin-max-value-length', $maxValueLength );
+			if( $maxValueLength < 1024 ) {
+				# Only warn if the value is below the sane 1024
+				$this->showMessage( 'config-suhosin-max-value-length', $maxValueLength );
+			}
 		} else {
 			$maxValueLength = -1;
 		}
-- 
2.20.1