Internal: Remove reference call method from api_get_settings() (useless and confusion-inducing) - refs #4405

pull/4517/head
Yannick Warnier 3 years ago
parent 64830792a8
commit 46f8e6e40a
  1. 6
      main/inc/global-min.inc.php
  2. 6
      main/inc/global.inc.php
  3. 4
      main/inc/lib/api.lib.php

@ -151,7 +151,7 @@ ChamiloSession::start($alreadyInstalled);
if ($_configuration['access_url'] != 1) {
$url_info = api_get_access_url($_configuration['access_url']);
if ($url_info['active'] == 1) {
$settings_by_access = &api_get_settings(null, 'list', $_configuration['access_url'], 1);
$settings_by_access = api_get_settings(null, 'list', $_configuration['access_url'], 1);
foreach ($settings_by_access as &$row) {
if (empty($row['variable'])) {
$row['variable'] = 0;
@ -167,7 +167,7 @@ if ($_configuration['access_url'] != 1) {
}
}
$result = &api_get_settings(null, 'list', 1);
$result = api_get_settings(null, 'list', 1);
foreach ($result as &$row) {
if ($_configuration['access_url'] != 1) {
if ($url_info['active'] == 1) {
@ -208,7 +208,7 @@ foreach ($result as &$row) {
}
}
$result = &api_get_settings('Plugins', 'list', $_configuration['access_url']);
$result = api_get_settings('Plugins', 'list', $_configuration['access_url']);
$_plugins = [];
foreach ($result as &$row) {
$key = &$row['variable'];

@ -222,7 +222,7 @@ ChamiloSession::start($alreadyInstalled);
if ($_configuration['access_url'] != 1) {
$url_info = api_get_access_url($_configuration['access_url']);
if ($url_info['active'] == 1) {
$settings_by_access = &api_get_settings(null, 'list', $_configuration['access_url'], 1);
$settings_by_access = api_get_settings(null, 'list', $_configuration['access_url'], 1);
foreach ($settings_by_access as &$row) {
if (empty($row['variable'])) {
$row['variable'] = 0;
@ -238,7 +238,7 @@ if ($_configuration['access_url'] != 1) {
}
}
$result = &api_get_settings(null, 'list', 1);
$result = api_get_settings(null, 'list', 1);
foreach ($result as &$row) {
if ($_configuration['access_url'] != 1) {
if ($url_info['active'] == 1) {
@ -279,7 +279,7 @@ foreach ($result as &$row) {
}
}
$result = &api_get_settings('Plugins', 'list', $_configuration['access_url']);
$result = api_get_settings('Plugins', 'list', $_configuration['access_url']);
$_plugins = [];
foreach ($result as &$row) {
$key = &$row['variable'];

@ -6388,7 +6388,7 @@ function api_get_access_url($id, $returnDefault = true)
*
* @return array Array of database results for the current settings of the current access URL
*/
function &api_get_settings($cat = null, $ordering = 'list', $access_url = 1, $url_changeable = 0)
function api_get_settings($cat = null, $ordering = 'list', $access_url = 1, $url_changeable = 0)
{
$table = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
$access_url = (int) $access_url;
@ -8384,7 +8384,7 @@ function api_set_settings_and_plugins()
if ($access_url_id != 1) {
$url_info = api_get_access_url($_configuration['access_url']);
if ($url_info['active'] == 1) {
$settings_by_access = &api_get_settings(null, 'list', $_configuration['access_url'], 1);
$settings_by_access = api_get_settings(null, 'list', $_configuration['access_url'], 1);
foreach ($settings_by_access as &$row) {
if (empty($row['variable'])) {
$row['variable'] = 0;

Loading…
Cancel
Save