Project

General

Profile

« Previous | Next » 

Revision 1897

Added by Dietmar over 11 years ago

  1. SqlImport removes BOM in sql files in a Windows Environment
    otherwise you have an error in your SQL syntax;

View differences:

branches/2.8.x/CHANGELOG
13 13

  
14 14

  
15 15

  
16
21 Mar-2013 Build 1897 Dietmar Woellbrink (Luisehahne)
17
# SqlImport removes BOM in sql files in a Windows Environment
18
  otherwise you have an error in your SQL syntax;
16 19
20 Mar-2013 Build 1896 Dietmar Woellbrink (Luisehahne)
17 20
# solved install exeption
18 21
! update wrapper module and set version to 2.8.4
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.3');
54
if(!defined('REVISION')) define('REVISION', '1896');
54
if(!defined('REVISION')) define('REVISION', '1897');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/framework/WbDatabase.php
421 421
		$aReplace = array($this->sTablePrefix, $sEngine, $sCollation);
422 422
		$sql = '';
423 423
		$aSql = file($sSqlDump);
424
//		$aSql[0] = preg_replace('/^\xEF\xBB\xBF/', '', $aSql[0]);
425
		$aSql[0] = preg_replace('/^[\xAA-\xFF]{3}/', '', $aSql[0]);
424 426
		while ( sizeof($aSql) > 0 ) {
425 427
			$sSqlLine = trim(array_shift($aSql));
426 428
			if (!preg_match('/^[-\/]+.*/', $sSqlLine)) {
427 429

  

Also available in: Unified diff