Merge pull request #10961 from annando/deprecated
Removed and replaced deprecated functionalities
This commit is contained in:
@@ -352,7 +352,8 @@ function item_post(App $a) {
|
||||
$filedas = FileTag::fileToArray($categories);
|
||||
}
|
||||
|
||||
$categories = FileTag::listToFile(trim($_REQUEST['category'] ?? ''), 'category');
|
||||
$list_array = explode(',', trim($_REQUEST['category'] ?? ''));
|
||||
$categories = FileTag::arrayToFile($list_array, 'category');
|
||||
|
||||
if (!empty($filedas) && is_array($filedas)) {
|
||||
// append the fileas stuff to the new categories list
|
||||
|
||||
@@ -308,7 +308,9 @@ function settings_post(App $a)
|
||||
|
||||
if ($email != $user['email']) {
|
||||
// check for the correct password
|
||||
if (!User::authenticate(intval(local_user()), $_POST['mpassword'])) {
|
||||
try {
|
||||
User::getIdFromPasswordAuthentication(local_user(), $_POST['mpassword']);
|
||||
} catch (Exception $ex) {
|
||||
$err .= DI::l10n()->t('Wrong Password.');
|
||||
$email = $user['email'];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user