Development

Changeset 14911

You must first sign up to be able to contribute.

Changeset 14911

Show
Ignore:
Timestamp:
01/21/09 09:29:23 (4 years ago)
Author:
dwhittle
Message:

dwhittle: merged changes to branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/dwhittle/1.2/lib/task/configure/sfConfigureDatabaseTask.class.php

    r13077 r14911  
    108108          $content = preg_replace('/^propel\.database\.url(\s*)=(\s*)(.+?)$/m', 'propel.database.url$1=$2'.$arguments['dsn'], $content); 
    109109 
    110           $content = preg_replace('/^propel\.database\.url(\s*)=(\s*)(.+?)$/m', 'propel.database.user$1=$2'.$arguments['username'], $content); 
    111           $content = preg_replace('/^propel\.database\.url(\s*)=(\s*)(.+?)$/m', 'propel.database.password$1=$2'.$arguments['password'], $content); 
     110          $content = preg_replace('/^propel\.database\.user(\s*)=(\s*)(.+?)$/m', 'propel.database.user$1=$2'.$arguments['username'], $content); 
     111          $content = preg_replace('/^propel\.database\.password(\s*)=(\s*)(.+?)$/m', 'propel.database.password$1=$2'.$arguments['password'], $content); 
    112112 
    113113          file_put_contents($propelini, $content); 

  • branches/dwhittle/1.3/lib/task/configure/sfConfigureDatabaseTask.class.php

    r13035 r14911  
    108108          $content = preg_replace('/^propel\.database\.url(\s*)=(\s*)(.+?)$/m', 'propel.database.url$1=$2'.$arguments['dsn'], $content); 
    109109 
    110           $content = preg_replace('/^propel\.database\.url(\s*)=(\s*)(.+?)$/m', 'propel.database.user$1=$2'.$arguments['username'], $content); 
    111           $content = preg_replace('/^propel\.database\.url(\s*)=(\s*)(.+?)$/m', 'propel.database.password$1=$2'.$arguments['password'], $content); 
     110          $content = preg_replace('/^propel\.database\.user(\s*)=(\s*)(.+?)$/m', 'propel.database.user$1=$2'.$arguments['username'], $content); 
     111          $content = preg_replace('/^propel\.database\.password(\s*)=(\s*)(.+?)$/m', 'propel.database.password$1=$2'.$arguments['password'], $content); 
    112112 
    113113          file_put_contents($propelini, $content);