Revision 2121
Added by darkviper over 9 years ago
| SqlImport.php | ||
|---|---|---|
| 106 | 106 |
{
|
| 107 | 107 |
$bRetval = false; |
| 108 | 108 |
// test if selected collation is available on current server. |
| 109 |
$sql = 'SHOW COLLATION LIKE \''.$this->oDb->escapeString($sCollation).'\'';
|
|
| 109 |
$sql = 'SHOW COLLATION LIKE \''.$this->oDb->escapeString(addcslashes($sCollation, '_%')).'\'';
|
|
| 110 | 110 |
if (($oAvailCollations = $this->oDb->doQuery($sql))) {
|
| 111 | 111 |
if (($oAvailCollations->numRows())) {
|
| 112 | 112 |
//use new collation |
| ... | ... | |
| 173 | 173 |
$sAction |
| 174 | 174 |
) |
| 175 | 175 |
); |
| 176 |
$sAction = ($sAction == '' ? 'install' : $sAction); |
|
| 177 |
if ($this->importSql($sAction)) {
|
|
| 176 |
if ($this->importSql(($sAction == '' ? 'install' : $sAction))) {
|
|
| 178 | 177 |
return true; |
| 179 | 178 |
} else {
|
| 180 | 179 |
$this->aErrMsg[] = $this->oDb->getError(); |
Also available in: Unified diff
! SqlImport::setDefaultCollation() requesting charsets modified
! framework/initialize some fixes and modifications