From 6e2a7deaccfee1c50c7863aac4fd1bed0fb15cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C4=81rti=C5=86=C5=A1=20T=C4=81lbergs?= Date: Mon, 29 Jun 2020 13:46:14 +0300 Subject: ..F....... [ZBX-17955] renamed references from "users_medias" to "medias" in forms --- ui/app/controllers/CControllerUserEditGeneral.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'ui/app/controllers/CControllerUserEditGeneral.php') diff --git a/ui/app/controllers/CControllerUserEditGeneral.php b/ui/app/controllers/CControllerUserEditGeneral.php index 005bd234cac..9182cbf7345 100644 --- a/ui/app/controllers/CControllerUserEditGeneral.php +++ b/ui/app/controllers/CControllerUserEditGeneral.php @@ -42,22 +42,22 @@ abstract class CControllerUserEditGeneral extends CController { */ protected function setUserMedias(array $data) { if ($this->hasInput('new_media')) { - $data['user_medias'][] = $this->getInput('new_media'); + $data['medias'][] = $this->getInput('new_media'); } elseif ($this->hasInput('enable_media')) { - if (array_key_exists($this->getInput('enable_media'), $data['user_medias'])) { - $data['user_medias'][$this->getInput('enable_media')]['active'] = MEDIA_STATUS_ACTIVE; + if (array_key_exists($this->getInput('enable_media'), $data['medias'])) { + $data['medias'][$this->getInput('enable_media')]['active'] = MEDIA_STATUS_ACTIVE; } } elseif ($this->hasInput('disable_media')) { - if (array_key_exists($this->getInput('disable_media'), $data['user_medias'])) { - $data['user_medias'][$this->getInput('disable_media')]['active'] = MEDIA_STATUS_DISABLED; + if (array_key_exists($this->getInput('disable_media'), $data['medias'])) { + $data['medias'][$this->getInput('disable_media')]['active'] = MEDIA_STATUS_DISABLED; } } $mediatypeids = []; - foreach ($data['user_medias'] as $media) { + foreach ($data['medias'] as $media) { $mediatypeids[$media['mediatypeid']] = true; } @@ -67,7 +67,7 @@ abstract class CControllerUserEditGeneral extends CController { 'preservekeys' => true ]); - foreach ($data['user_medias'] as &$media) { + foreach ($data['medias'] as &$media) { $media['name'] = $mediatypes[$media['mediatypeid']]['name']; $media['mediatype'] = $mediatypes[$media['mediatypeid']]['type']; $media['send_to_sort_field'] = is_array($media['sendto']) @@ -76,9 +76,9 @@ abstract class CControllerUserEditGeneral extends CController { } unset($media); - CArrayHelper::sort($data['user_medias'], ['name', 'send_to_sort_field']); + CArrayHelper::sort($data['medias'], ['name', 'send_to_sort_field']); - foreach ($data['user_medias'] as &$media) { + foreach ($data['medias'] as &$media) { unset($media['send_to_sort_field']); } unset($media); -- cgit v1.2.3