Merge branch 'cherry-pick-f4c6e744' into '1.2.1-fixes'

Merge branch '5789-ldif-import-can-trigger-php-errors-on-empty-file' into '1.2.1-fixes'

See merge request fusiondirectory/fd!343

include/class_ldap.inc

@@ -1052,8 +1052,9 @@ class LDAP
     }
 
     /* Joining lines */
-    $line   = NULL;
-    $entry  = array();
+    $line       = NULL;
+    $entry      = array();
+    $entries    = array();
     $entryStart = -1;
     foreach ($fileLines as $lineNumber => $fileLine) {
       if (preg_match('/^ /', $fileLine)) {
@@ -1123,6 +1124,8 @@ class LDAP
         throw new LDIFImportException(sprintf(_('Error while importing dn: "%s", please check your LDIF from line %s on!'), $entry['dn'][0], $startLine));
       }
     }
+
+    return count($entries);
   }
 
   /*! \brief Function to Imports a single entry