]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
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)
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


Trivial merge