This reverts commit db949bb802.
db949bb802
Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions.
Conflicts: include/config.php update.php