merged branch havvg/master (PR #3588)

fabpot · fabpot · commit e01106f2b3d2 · 2012-03-14T12:53:48.000+01:00
Commits ------- 235be43 fix PropelLogger stopwatch events Discussion ---------- fix PropelLogger "Event Propel Query X is not started." --------------------------------------------------------------------------- by willdurand at 2012-03-13T16:00:39Z :+1:
diff --git a/src/Symfony/Bridge/Propel1/Logger/PropelLogger.php b/src/Symfony/Bridge/Propel1/Logger/PropelLogger.php
@@ -145,6 +145,7 @@ public function debug($message)
 
                 $add = false;
             } elseif ($this->isPrepared) {
+                $this->isPrepared = false;
                 $this->stopwatch->stop($watch);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,7 @@ public function debug($message)`
`145`	`145`
`146`	`146`	`$add = false;`
`147`	`147`	`} elseif ($this->isPrepared) {`
	`148`	`+ $this->isPrepared = false;`
`148`	`149`	`$this->stopwatch->stop($watch);`
`149`	`150`	`}`
`150`	`151`	`}`