]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - lib/apiaction.php
Merge branch 'master' into 'master'
authormmn <mmn@hethane.se>
Fri, 20 Nov 2015 17:46:53 +0000 (17:46 +0000)
committermmn <mmn@hethane.se>
Fri, 20 Nov 2015 17:46:53 +0000 (17:46 +0000)
commit5d548d157fbf868ad07998316d546e0d208da9cc
tree4966a60507b90b4f3765e3f93a5f83c551c31732
parentdbdac9cfbe470d2742c3f8bf42145ff648cf12c9
parentabb8d1273ea66fb900594262b81011b111de3dea
Merge branch 'master' into 'master'

block check can't be done inside the same try-expression as Subscription::getSub…

…scription(), since if that throws a NoResultException, the block check will not be done. and if you're blocking someone you are not subscribing to them.

See merge request !59