Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
a0a43c0e
Commit
a0a43c0e
authored
May 22, 2015
by
Guilherme Blanco
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #864 from randomonkey/master
Fix undefined notices within MasterSlaveConnection
parents
9e795469
cfddafc9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
MasterSlaveConnection.php
lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php
+2
-2
No files found.
lib/Doctrine/DBAL/Connections/MasterSlaveConnection.php
View file @
a0a43c0e
...
...
@@ -151,7 +151,7 @@ class MasterSlaveConnection extends Connection
// If we have a connection open, and this is not an explicit connection
// change request, then abort right here, because we are already done.
// This prevents writes to the slave in case of "keepSlave" option enabled.
if
(
$this
->
_conn
&&
!
$requestedConnectionChange
)
{
if
(
isset
(
$this
->
_conn
)
&&
$this
->
_conn
&&
!
$requestedConnectionChange
)
{
return
false
;
}
...
...
@@ -162,7 +162,7 @@ class MasterSlaveConnection extends Connection
$forceMasterAsSlave
=
true
;
}
if
(
$this
->
connections
[
$connectionName
])
{
if
(
isset
(
$this
->
connections
[
$connectionName
])
&&
$this
->
connections
[
$connectionName
])
{
$this
->
_conn
=
$this
->
connections
[
$connectionName
];
if
(
$forceMasterAsSlave
&&
!
$this
->
keepSlave
)
{
...
...
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