Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma

2019-01-27 23:23:38 +01:00
parent 13f37204f6 ecc30b8ffe
commit b10558bacd
759 changed files with 4357 additions and 4160 deletions
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -321,7 +321,7 @@ class UserTest extends PHPUnit_Framework_TestCase
     * @param   array       $fieldstoignorearray    Array of fields to ignore in diff
     * @return  array                               Array with differences
     */
-    public function objCompare($oA,$oB,$ignoretype=true,$fieldstoignorearray=array('id'))
+    public function objCompare($oA, $oB, $ignoretype = true, $fieldstoignorearray = array('id'))
    {
        $retAr=array();