Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
S
Silex
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
common
Silex
Commits
895c77b6
Commit
895c77b6
authored
Jul 13, 2012
by
Fabien Potencier
Browse files
Options
Browse Files
Download
Plain Diff
merged branch pborreli/master (PR #434)
Commits -------
a7c1baee
Fixed typos Discussion ---------- Fixed typos
parents
6358f7ef
a7c1baee
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
src/Silex/Application/SwiftmailerTrait.php
src/Silex/Application/SwiftmailerTrait.php
+1
-1
src/Silex/Provider/DoctrineServiceProvider.php
src/Silex/Provider/DoctrineServiceProvider.php
+1
-1
No files found.
src/Silex/Application/SwiftmailerTrait.php
View file @
895c77b6
...
@@ -21,7 +21,7 @@ trait SwiftmailerTrait
...
@@ -21,7 +21,7 @@ trait SwiftmailerTrait
/**
/**
* Sends an email.
* Sends an email.
*
*
* @param \Swift_Message $message A \Swift_Message intance
* @param \Swift_Message $message A \Swift_Message in
s
tance
*/
*/
public
function
mail
(
\Swift_Message
$message
)
public
function
mail
(
\Swift_Message
$message
)
{
{
...
...
src/Silex/Provider/DoctrineServiceProvider.php
View file @
895c77b6
...
@@ -64,7 +64,7 @@ class DoctrineServiceProvider implements ServiceProviderInterface
...
@@ -64,7 +64,7 @@ class DoctrineServiceProvider implements ServiceProviderInterface
$dbs
=
new
\Pimple
();
$dbs
=
new
\Pimple
();
foreach
(
$app
[
'dbs.options'
]
as
$name
=>
$options
)
{
foreach
(
$app
[
'dbs.options'
]
as
$name
=>
$options
)
{
if
(
$app
[
'dbs.default'
]
===
$name
)
{
if
(
$app
[
'dbs.default'
]
===
$name
)
{
// we use shortcuts here in case the default has been overriden
// we use shortcuts here in case the default has been overrid
d
en
$config
=
$app
[
'db.config'
];
$config
=
$app
[
'db.config'
];
$manager
=
$app
[
'db.event_manager'
];
$manager
=
$app
[
'db.event_manager'
];
}
else
{
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment