Revision 2111
Added by darkviper almost 10 years ago
- SqlImport fixed a Typo in Search-Replace of placeholders
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 12 | 12 |
=============================================================================== |
| 13 | 13 |
|
| 14 | 14 |
25 Nov-2014 Build 2110 Manuela v.d.Decken(DarkViper) |
| 15 |
# SqlImport fixed a Typo in Search-Replace of placeholders |
|
| 16 |
25 Nov-2014 Build 2110 Manuela v.d.Decken(DarkViper) |
|
| 15 | 17 |
# install/ change old install-struct format into new one |
| 16 | 18 |
25 Nov-2014 Build 2109 Manuela v.d.Decken(DarkViper) |
| 17 | 19 |
# admin/settings/ little typofix, save settings now use official method |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 51 | 51 |
|
| 52 | 52 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 53 | 53 |
if(!defined('VERSION')) define('VERSION', '2.8.4');
|
| 54 |
if(!defined('REVISION')) define('REVISION', '2110');
|
|
| 54 |
if(!defined('REVISION')) define('REVISION', '2111');
|
|
| 55 | 55 |
if(!defined('SP')) define('SP', '');
|
| branches/2.8.x/wb/framework/SqlImport.php | ||
|---|---|---|
| 203 | 203 |
$sCharset = $aTmp[0]; |
| 204 | 204 |
// get from addReplacements |
| 205 | 205 |
$aSearch = $this->aReplacements['key']; |
| 206 |
/* *** ATTENTION:: Do Not Change The Order Of Search-Replace Statements !! *** */ |
|
| 206 | 207 |
// define basic array of searches |
| 207 |
$aSearch[] = '/\{TABLE_PREFIX\}/';
|
|
| 208 |
$aSearch[] = '/\{FIELD_COLLATION\}/';
|
|
| 209 |
$aSearch[] = '/\{TABLE_ENGINE\}/';
|
|
| 210 |
$aSearch[] = '/\{TABLE_ENGINE=([a-zA-Z_0-9]*)\}/';
|
|
| 211 |
$aSearch[] = '/\{CHARSET\}/';
|
|
| 212 |
$aSearch[] = '/\{COLLATION\}/';
|
|
| 208 |
$aSearch[] = '/\{TABLE_PREFIX\}/'; /* step 0 */
|
|
| 209 |
$aSearch[] = '/\{FIELD_COLLATION\}/'; /* step 1 */
|
|
| 210 |
$aSearch[] = '/\{TABLE_ENGINE\}/'; /* step 2 */
|
|
| 211 |
$aSearch[] = '/\{TABLE_ENGINE=([a-zA-Z_0-9]*)\}/'; /* step 3 */
|
|
| 212 |
$aSearch[] = '/\{CHARSET\}/'; /* step 4 */
|
|
| 213 |
$aSearch[] = '/\{COLLATION\}/'; /* step 5 */
|
|
| 213 | 214 |
// get from addReplacements |
| 214 | 215 |
$aReplace = $this->aReplacements['value']; |
| 215 | 216 |
// define basic array of replacements |
| 216 |
$aReplace[] = $this->sTablePrefix; |
|
| 217 |
$aReplace[] = ' COLLATE {COLLATION}';
|
|
| 218 |
$aReplace[] = ' {ENGINE='.$this->sEngine.'}';
|
|
| 219 |
$aReplace[] = ' ENGINE=$1 DEFAULT CHARSET={CHARSET} COLLATE={COLLATION}';
|
|
| 220 |
$aReplace[] = $sCharset; |
|
| 221 |
$aReplace[] = $this->sCollation; |
|
| 217 |
$aReplace[] = $this->sTablePrefix; /* step 0 */
|
|
| 218 |
$aReplace[] = ' COLLATE {COLLATION}'; /* step 1 */
|
|
| 219 |
$aReplace[] = ' {TABLE_ENGINE='.$this->sEngine.'}'; /* step 2 */
|
|
| 220 |
$aReplace[] = ' ENGINE=$1 DEFAULT CHARSET={CHARSET} COLLATE={COLLATION}'; /* step 3 */
|
|
| 221 |
$aReplace[] = $sCharset; /* step 4 */
|
|
| 222 |
$aReplace[] = $this->sCollation; /* step 5 */
|
|
| 222 | 223 |
|
| 223 | 224 |
$sql = ''; // buffer for statements |
| 224 | 225 |
$aSql = file($this->sStructFile, FILE_SKIP_EMPTY_LINES|FILE_IGNORE_NEW_LINES); |
Also available in: Unified diff