← Back to branch summary

~piersharding/udi/master-udi

« back to all changes in this revision

Viewing changes to lib/import_functions.php

  • Committer: Piers Harding
  • Date: 2011-10-02 21:27:04 UTC
  • mfrom: (151.1.63)
  • Revision ID: git-v1:a3e8fccd857706bbe9f37a05061ddc2e2d0b8143
Merge branch 'master' into test-master-merge

Conflicts:
        lib/ds_ldap_pla.php
        lib/page.php

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/import_functions.php
295
295
                        return $current;
296
296
 
297
297
                } else
298
 
                        return false;
 
298
                        return array();
299
299
        }
300
300
 
301
301
        /**