diff --git a/lam/docs/devel/upgrade.htm b/lam/docs/devel/upgrade.htm
index 3c6804dd..d25ac440 100644
--- a/lam/docs/devel/upgrade.htm
+++ b/lam/docs/devel/upgrade.htm
@@ -21,6 +21,7 @@
+
@@ -58,7 +59,7 @@ This is a list of API changes for all LAM releases.
-
5.7 -> 5.8
+5.7 -> 6.0
- All account types allow multiple configurations by default.
- the following methods in baseModule have a new parameter $typeId:
@@ -72,10 +73,12 @@ This is a list of API changes for all LAM releases.
- getLDAPAliases()
- get_uploadColumns()
- - build_uploadAccounts()
+ - build_uploadAccounts()
+ - get_RDNAttributes()
+
baseType->doUploadPostActions(): new parameter $selectedModules
diff --git a/lam/docs/manual-sources/chapter-installation.xml b/lam/docs/manual-sources/chapter-installation.xml
index 6c5ba4f1..6a6ed8aa 100644
--- a/lam/docs/manual-sources/chapter-installation.xml
+++ b/lam/docs/manual-sources/chapter-installation.xml
@@ -574,6 +574,12 @@
version. Unless explicitly noticed there is no need to install an
intermediate release.
+
+ 5.7 -> 6.0
+
+ No actions needed.
+
+
5.6 -> 5.7
diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc
index 1865c5c6..f27470c4 100644
--- a/lam/lib/baseModule.inc
+++ b/lam/lib/baseModule.inc
@@ -462,11 +462,12 @@ abstract class baseModule {
*
* Example: return array('uid' => 'normal', 'cn' => 'low')
*
+ * @param string $typeId account type
* @return array list of attributes
*
* @see baseModule::get_metaData()
*/
- public function get_RDNAttributes() {
+ public function get_RDNAttributes($typeId) {
if (isset($this->meta['RDN'])) return $this->meta['RDN'];
else return array();
}
diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index ec7591ff..ddbc5408 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -164,7 +164,7 @@ function getRDNAttributes($typeId, $selectedModules=null) {
for ($i = 0; $i < sizeof($mods); $i++) {
// get list of attributes
$module = moduleCache::getModule($mods[$i], \LAM\TYPES\getScopeFromTypeId($typeId));
- $attrs = $module->get_RDNAttributes();
+ $attrs = $module->get_RDNAttributes($typeId);
$keys = array_keys($attrs);
// sort attributes
for ($k = 0; $k < sizeof($keys); $k++) {