lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Remove help to install when field is disabled

Browse Source
This commit is contained in:
Laurent Destailleur 2011-01-16 00:22:10 +00:00
parent cd8eb72f47
commit 9849e4f361
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/install/etape0.php
View File

@ -292,7 +292,7 @@ if (! $error && $db->connected)
if ($nbofchoice > 1) { if ($nbofchoice > 1) {
?></td> ?></td>
<td class="label"> <td class="label">
<div class="comment"><?php echo $langs->trans("CharacterSetDatabaseComment"); ?></div> <div class="comment"><?php if ($nbofchoice > 1) echo $langs->trans("CharacterSetDatabaseComment"); ?></div>
</td> </td>
<?php } ?> <?php } ?>
</tr> </tr>
@ -316,7 +316,7 @@ if (! $error && $db->connected)
// We keep only utf8 and iso // We keep only utf8 and iso
//if (($_POST["db_type"] == 'mysql' ||$_POST["db_type"] == 'mysqli') && ! preg_match('/(utf8_general|latin1_swedish)/i',$collation['collation'])) $linedisabled=true; //if (($_POST["db_type"] == 'mysql' ||$_POST["db_type"] == 'mysqli') && ! preg_match('/(utf8_general|latin1_swedish)/i',$collation['collation'])) $linedisabled=true;
if (($_POST["db_type"] == 'mysql' ||$_POST["db_type"] == 'mysqli') && ! preg_match('/utf8/i',$collation['collation'])) $linedisabled=true; if (($_POST["db_type"] == 'mysql' ||$_POST["db_type"] == 'mysqli') && ! preg_match('/utf8_general/i',$collation['collation'])) $linedisabled=true;
if ($defaultCollationConnection == $collation['collation']) if ($defaultCollationConnection == $collation['collation'])
{ {