Replace api_array_column with array_column, add fallback for php < 5.5

1.10.x
Julio Montoya 11 years ago
parent 3d124db010
commit 7512eb308c
  1. 3
      composer.json
  2. 6
      main/inc/ajax/model.ajax.php
  3. 26
      main/inc/lib/api.lib.php
  4. 2
      main/survey/survey.lib.php

@ -63,7 +63,8 @@
"bower-asset/fullcalendar": "2.3.*",
"bower-asset/mediaelement": "2.16.*",
"bower-asset/modernizr": "2.8.*",
"bower-asset/jqueryui-timepicker-addon": "1.5.*"
"bower-asset/jqueryui-timepicker-addon": "1.5.*",
"ramsey/array_column": "~1.1"
},
"require-dev": {
"behat/behat": "2.5.*@stable",

@ -198,14 +198,14 @@ switch ($action) {
'admin',
null
);
$userIdList = api_array_column($userIdList, 'user_id');
$userIdList = array_column($userIdList, 'user_id');
$sessionList = SessionManager::get_sessions_list();
$sessionIdList = api_array_column($sessionList, 'id');
$sessionIdList = array_column($sessionList, 'id');
$courseCodeList = array();
foreach ($sessionList as $session) {
$courses = SessionManager::get_course_list_by_session_id($session['id']);
$courseCodeList = array_merge($courseCodeList, api_array_column($courses, 'code'));
$courseCodeList = array_merge($courseCodeList, array_column($courses, 'code'));
}
}

@ -8078,29 +8078,3 @@ function apiIsSystemInstalled()
$version = $settingsRow['selected_value'];
return array('installed' => 1, 'message' => $version);
}
/**
* Fallback for PHP 5.5 array_colum function.
* Return the values from a single column in the $input array
* @param array $input Array from which to pull a column of values
* @param string $columnName The column of values to return
* @return array
*/
function api_array_column($input, $columnName)
{
if (function_exists('array_column')) {
return array_column($input, $columnName);
}
$result = array();
foreach ($input as $value) {
if (!array_key_exists($columnName, $value)) {
continue;
}
$result[] = $value[$columnName];
}
return $result;
}

@ -3405,7 +3405,7 @@ class SurveyUtil
foreach ($groupList as $groupId) {
$userGroupList = GroupManager::getStudents($groupId);
$userGroupIdList = api_array_column($userGroupList, 'user_id');
$userGroupIdList = array_column($userGroupList, 'user_id');
$users_array = array_merge($users_array, $userGroupIdList);
$params = array(

Loading…
Cancel
Save