nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better check for server system (patch #1462738).

Browse Source
This commit is contained in:
Michal Čihař
2006-04-10 13:01:05 +00:00
parent fd0bb46fa4
commit c53264cac0
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,6 +8,8 @@ $Source$
2006-04-10 Michal Čihař <michal@cihar.com> 2006-04-10 Michal Čihař <michal@cihar.com>
* libraries/Config.class.php: Check also default config mtime (bug * libraries/Config.class.php: Check also default config mtime (bug
#1467620). #1467620).
* libraries/Config.class.php: Better check for server system (patch
#1462738).
2006-04-09 Marc Delisle <lem9@users.sourceforge.net> 2006-04-09 Marc Delisle <lem9@users.sourceforge.net>
* tbl_replace.php, libraries/dbi/mysqli.dbi.lib.php: bug #1255923, * tbl_replace.php, libraries/dbi/mysqli.dbi.lib.php: bug #1255923,

15
libraries/Config.class.php
View File

@@ -247,10 +247,17 @@ class PMA_Config
*/ */
function checkWebServerOs() function checkWebServerOs()
{ {
if (defined('PHP_OS') && stristr(PHP_OS, 'win')) { // Default to Unix or Equiv
$this->set('PMA_IS_WINDOWS', 1); $this->set('PMA_IS_WINDOWS', 0);
} else { // If PHP_OS is defined then continue
$this->set('PMA_IS_WINDOWS', 0); if (defined('PHP_OS')) {
if (stristr(PHP_OS, 'win') ) {
// Is it some version of Windows
$this->set('PMA_IS_WINDOWS', 1);
} elseif (stristr(PHP_OS, 'OS/2')) {
// Is it OS/2 (No file permissions like Windows)
$this->set('PMA_IS_WINDOWS', 1);
}
} }
} }