Revision 1591
Added by darkviper almost 13 years ago
branches/2.8.x/CHANGELOG | ||
---|---|---|
11 | 11 |
! = Update/Change |
12 | 12 |
|
13 | 13 |
=========================== add small Features 2.8.2 ========================== |
14 |
31 Jan-2012 Build 1591 Werner v.d.Decken(DarkViper) |
|
15 |
# little Regex-fix in database::SqlImport(). |
|
14 | 16 |
25 Jan-2012 Build 1590 Werner v.d.Decken(DarkViper) |
15 | 17 |
! mod form: added request var to submit a request identifier. |
16 | 18 |
! argument ?fri=12345 on GET-view will submit 'FormRequestId: 12345' by email |
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.2'); |
54 |
if(!defined('REVISION')) define('REVISION', '1590');
|
|
54 |
if(!defined('REVISION')) define('REVISION', '1591');
|
|
55 | 55 |
if(!defined('SP')) define('SP', 'SP2'); |
branches/2.8.x/wb/framework/class.database.php | ||
---|---|---|
286 | 286 |
* Import a standard *.sql dump file |
287 | 287 |
* @param string $sSqlDump link to the sql-dumpfile |
288 | 288 |
* @param string $sTablePrefix |
289 |
* @param bool $bPreserve set to true will ignore all DROP TABLE statements |
|
289 | 290 |
* @param string $sTblEngine |
290 | 291 |
* @param string $sTblCollation |
291 |
* @param bool $bPreserve set to true will ignore all DROP TABLE statements |
|
292 | 292 |
* @return boolean true if import successful |
293 | 293 |
*/ |
294 | 294 |
public function SqlImport($sSqlDump, |
295 | 295 |
$sTablePrefix = '', |
296 |
$bPreserve = true, |
|
296 | 297 |
$sTblEngine = 'ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci', |
297 |
$sTblCollation = ' collate utf8_unicode_ci', |
|
298 |
$bPreserve = true) |
|
298 |
$sTblCollation = ' collate utf8_unicode_ci') |
|
299 | 299 |
{ |
300 | 300 |
$retval = true; |
301 | 301 |
$this->error = ''; |
... | ... | |
305 | 305 |
$aSql = file($sSqlDump); |
306 | 306 |
while ( sizeof($aSql) > 0 ) { |
307 | 307 |
$sSqlLine = trim(array_shift($aSql)); |
308 |
if (preg_match('/^[-\/].+/', $sSqlLine)) {
|
|
308 |
if (!preg_match('/^[-\/]+.*/', $sSqlLine)) {
|
|
309 | 309 |
$sql = $sql.' '.$sql_line; |
310 | 310 |
if ((substr($sql,-1,1) == ';')) { |
311 | 311 |
$sql = trim(str_replace( $aSearch, $aReplace, $sql)); |
Also available in: Unified diff
little Regex-fix in database::SqlImport()