Development

Changeset 6006

You must first sign up to be able to contribute.

Changeset 6006

Show
Ignore:
Timestamp:
11/14/07 08:42:31 (1 year ago)
Author:
fabien
Message:

fixed creole DSN when using an empty password with a colon before like in mysql://root:@localhost

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/data/skeleton/project/config/databases.yml

    r875 r6006  
    33#    class:          sfPropelDatabase 
    44#    param: 
    5 #      dsn:          mysql://root:@localhost/dbname 
     5#      dsn:          mysql://root@localhost/dbname 

  • trunk/data/skeleton/project/config/propel.ini

    r5093 r6006  
    33propel.project             = ##PROJECT_NAME## 
    44propel.database            = mysql 
    5 propel.database.createUrl  = mysql://localhost/ 
    6 propel.database.url        = mysql://localhost/##PROJECT_NAME## 
     5propel.database.createUrl  = mysql://root@localhost/ 
     6propel.database.url        = mysql://root@localhost/##PROJECT_NAME## 
    77 
    88propel.addGenericAccessors = true 

  • trunk/lib/plugins/sfPropelPlugin/lib/vendor/creole/Creole.php

    r6005 r6006  
    301301        ); 
    302302 
    303     $preg_query = "!^(([a-z0-9]+)(\(([^()]+)\))?)(://((((([^@/:]+)(:([^@/]+))?)@)?((([a-z]+)\((([^?():]+)(:([^()?]+))?)\))|((([^/?:]+)(:([^/?]+))?))))/?)?([^?]+)?(\?(.+))?)?$!i"; 
     303    $preg_query = "!^(([a-z0-9]+)(\(([^()]+)\))?)(://((((([^@/:]+)(:([^@/]*))?)@)?((([a-z]+)\((([^?():]+)(:([^()?]+))?)\))|((([^/?:]+)(:([^/?]+))?))))/?)?([^?]+)?(\?(.+))?)?$!i"; 
    304304     
    305305    $info = array();