Merge branch '4.3' into 4.4

javiereguiluz · javiereguiluz · commit 3dde3f94dc3e · 2019-10-25T15:31:56.000+02:00
* 4.3:
  Delete apostrophe in custom-transport.rst
diff --git a/messenger/custom-transport.rst b/messenger/custom-transport.rst
@@ -61,7 +61,7 @@ Here is a simplified example of a database transport::
             $row = $this->db->createQuery(
                     'SELECT *
                     FROM my_queue
-                    WHERE (delivered_at IS NULL OR delivered_at < :redeliver_timeout')
+                    WHERE (delivered_at IS NULL OR delivered_at < :redeliver_timeout)
                     AND handled = FALSE'
                 )
                 ->setParameter('redeliver_timeout', new DateTimeImmutable('-5minutes'))

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ Here is a simplified example of a database transport::`
`61`	`61`	`$row = $this->db->createQuery(`
`62`	`62`	`'SELECT *`
`63`	`63`	`FROM my_queue`
`64`		`- WHERE (delivered_at IS NULL OR delivered_at < :redeliver_timeout')`
	`64`	`+ WHERE (delivered_at IS NULL OR delivered_at < :redeliver_timeout)`
`65`	`65`	`AND handled = FALSE'`
`66`	`66`	`)`
`67`	`67`	`->setParameter('redeliver_timeout', new DateTimeImmutable('-5minutes'))`