Merge branch '4.2' into 4.3

2019-01-10 14:56:15 +13:00 · 2019-01-10 14:56:15 +13:00 · 0e8b87087d
parent bf095956a5 9ccba1b0bb
commit 0e8b87087d
1 changed files with 1 additions and 1 deletions
--- a/tests/php/Controllers/CMSMainTest.php
+++ b/tests/php/Controllers/CMSMainTest.php
@ -30,7 +30,7 @@ class CMSMainTest extends FunctionalTest
 {
    protected static $fixture_file = 'CMSMainTest.yml';

-    static protected $orig = array();
+    protected static $orig = array();

    public function setUp()
    {