KOKOS250 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/287746
Change subject: Improve the check of writability into temporary directory.
......................................................................
Improve the check of writability into temporary directory.
Change-Id: I1907151b4844b76b1898d13b0dce043259f1f2aa
---
M includes/installer/Installer.php
M includes/installer/i18n/cs.json
M includes/installer/i18n/en.json
3 files changed, 29 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/46/287746/1
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index a9f219f..458631d 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -135,6 +135,7 @@
'envCheckCtype',
'envCheckIconv',
'envCheckJSON',
+ 'envCheckTempDirectory',
];
/**
@@ -1188,6 +1189,30 @@
return true;
}
+ public function envCheckTempDirectory() {
+ $returnStatus = null;
+ try {
+ $tmpDir = wfTempDir();
+ if (is_dir( $tmpDir ) && is_writable( $tmpDir ) ) {
+ $testFile = $tmpDir . DIRECTORY_SEPARATOR .
'mw_tmpdir_test_' . time();
+ // Suppress warning in this extreme case
+ @touch( $testFile );
+ if ( file_exists( $testFile ) ) {
+ $returnStatus = true;
+ }
+ @unlink( $testFile );
+ }
+ } catch ( MWException $e ) {
+ // Nothing. $returnStatus is null.
+ }
+
+ if( $returnStatus === null ) {
+ $this->showMessage( 'config-temp-directory-warning' );
+ }
+
+ return $returnStatus;
+ }
+
/**
* @return bool
*/
diff --git a/includes/installer/i18n/cs.json b/includes/installer/i18n/cs.json
index 905e326..45925f7 100644
--- a/includes/installer/i18n/cs.json
+++ b/includes/installer/i18n/cs.json
@@ -324,5 +324,6 @@
"config-nofile": "Soubor „$1“ nelze nalézt. Byl smazán?",
"config-extension-link": "Věděli jste, že vaše wiki podporuje
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions
rozšíření]?\n\nMůžete si prohlédnout
[//www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category
seznam rozšíření po kategoriích].",
"mainpagetext": "<strong>MediaWiki byla úspěšně
nainstalována.</strong>",
- "mainpagedocfooter": "[//meta.wikimedia.org/wiki/Help:Contents
Uživatelská příručka] vám napoví, jak používat MediaWiki.\n\n== Začínáme
==\n\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings
Nastavení konfigurace]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Často kladené otázky o
MediaWiki]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce
E-mailová konference oznámení MediaWiki]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources
Překlad MediaWiki do vašeho jazyka]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam Naučte se
bojovat se spamem na vaší wiki]"
+ "mainpagedocfooter": "[//meta.wikimedia.org/wiki/Help:Contents
Uživatelská příručka] vám napoví, jak používat MediaWiki.\n\n== Začínáme
==\n\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings
Nastavení konfigurace]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Často kladené otázky o
MediaWiki]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce
E-mailová konference oznámení MediaWiki]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources
Překlad MediaWiki do vašeho jazyka]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam Naučte se
bojovat se spamem na vaší wiki]",
+ "config-temp-directory-warning": "Váš adresář pro dočasné soubory
neumožňuje zápis."
}
diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json
index b97cc96..0802575 100644
--- a/includes/installer/i18n/en.json
+++ b/includes/installer/i18n/en.json
@@ -315,5 +315,6 @@
"config-nofile": "File \"$1\" could not be found. Has it been deleted?",
"config-extension-link": "Did you know that your wiki supports
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions
extensions]?\n\nYou can browse
[//www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category
extensions by category] or the [//www.mediawiki.org/wiki/Extension_Matrix
Extension Matrix] to see the full list of extensions.",
"mainpagetext": "<strong>MediaWiki has been installed.</strong>",
- "mainpagedocfooter": "Consult the
[//meta.wikimedia.org/wiki/Help:Contents User's Guide] for information on using
the wiki software.\n\n== Getting started ==\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings
Configuration settings list]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MediaWiki FAQ]\n*
[https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki
release mailing list]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources
Localise MediaWiki for your language]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam Learn how to
combat spam on your wiki]"
+ "mainpagedocfooter": "Consult the
[//meta.wikimedia.org/wiki/Help:Contents User's Guide] for information on using
the wiki software.\n\n== Getting started ==\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings
Configuration settings list]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MediaWiki FAQ]\n*
[https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki
release mailing list]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources
Localise MediaWiki for your language]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam Learn how to
combat spam on your wiki]",
+ "config-temp-directory-warning": "Your directory for temporary files
does not writable."
}
--
To view, visit https://gerrit.wikimedia.org/r/287746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1907151b4844b76b1898d13b0dce043259f1f2aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: KOKOS250 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
