Merge branch 'master' into feature-13011/installation_on_multiple_servers

application/libraries/LDAPLib.php

@@ -220,7 +220,9 @@ class LDAPLib
 		}
 		else // Connection error
 		{
-			return error(ldap_error($ldapConnection));
+			return error(
+				'An error occurred while connecting to the LDAP server: '.$ldapConfigs[self::SERVER].':'.$ldapConfigs[self::PORT]
+			);
 		}
 	}
 }

application/libraries/VariableLib.php

@@ -100,6 +100,18 @@ class VariableLib
 		return $result;
 	}
 
+	public function changeStudengangsTypVar($uid, $name, $change)
+	{
+		$result = error('error when setting variable!');
+
+		if (isEmptyString($uid) || isEmptyString($name) || isEmptyString($change))
+            return $result;
+
+		$result = $this->_ci->VariableModel->setVariable($uid, $name, $change);
+        $this->_setVariable($uid, $name);
+        return $result;
+	}
+
 	/**
 	 * "Refreshes" variable value with given name by retrieving current value from db and saving it.
 	 * @param $uid