Merge "Use Database::addQuotes instead of hard coded apostrophs"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Fri, 24 Feb 2017 20:56:22 +0000 (20:56 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 24 Feb 2017 20:56:22 +0000 (20:56 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 24 Feb 2017 20:56:22 +0000 (20:56 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 24 Feb 2017 20:56:22 +0000 (20:56 +0000)
diff --cc includes/EditPage.php
Simple merge
diff --cc includes/WatchedItemQueryService.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 24 Feb 2017 20:56:22 +0000 (20:56 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 24 Feb 2017 20:56:22 +0000 (20:56 +0000)
		1	2
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/WatchedItemQueryService.php	patch \|	diff1 \|	diff2 \|	blob \| history