diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php index 70e505c18af80..df08a2acd7033 100644 --- a/apps/user_ldap/appinfo/app.php +++ b/apps/user_ldap/appinfo/app.php @@ -60,9 +60,3 @@ '\OCA\User_LDAP\Helper', 'loginName2UserName' ); - -if(OCP\App::isEnabled('user_webdavauth')) { - OCP\Util::writeLog('user_ldap', - 'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour', - OCP\Util::WARN); -} diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index 58116b8c0e71c..82e61cd5dcd1f 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -66,9 +66,7 @@
  • t('Expert'));?>
  • t('Advanced'));?>
  • - '.$l->t('Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.').'

    '); - } + '.$l->t('Warning: The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.').'

    '); }