Merge pull request #6434 from JoeMurray/patch-4
authorDave Greenberg <dave@civicrm.org>
Thu, 6 Aug 2015 23:25:06 +0000 (16:25 -0700)
committerDave Greenberg <dave@civicrm.org>
Thu, 6 Aug 2015 23:25:06 +0000 (16:25 -0700)
prevent error on $mainBlockId not set


Trivial merge