joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-26 07:13:21 +00:00
Code Packages Releases Activity

[4.0] Remove a "development" error_reporting as obsolete (#28580)

Browse Source
This commit is contained in:
Fedir Zinchuk 2020-04-12 00:29:01 +03:00 committed by GitHub
parent ffb0aea177
commit 33327bd264
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
administrator/components/com_config/forms/application.xml
View File

@ -788,7 +788,6 @@
<option value="none">COM_CONFIG_FIELD_VALUE_NONE</option>
<option value="simple">COM_CONFIG_FIELD_VALUE_SIMPLE</option>
<option value="maximum">COM_CONFIG_FIELD_VALUE_MAXIMUM</option>
<option value="development">COM_CONFIG_FIELD_VALUE_DEVELOPMENT</option>
</field>
<field

7
administrator/components/com_config/src/Model/ApplicationModel.php
View File

@ -110,6 +110,13 @@ class ApplicationModel extends FormModel
$data = array_merge($data, $temp);
}
// Correct error_reporting value, since we removed "development", the "maximum" should be set instead
// @TODO: This can be removed in 5.0
if (!empty($data['error_reporting']) && $data['error_reporting'] === 'development')
{
$data['error_reporting'] = 'maximum';
}
return $data;
}

7
administrator/includes/framework.php
View File

@ -61,17 +61,12 @@ switch ($config->error_reporting)
break;
case 'maximum':
case 'development': // <= Stays for backward compatibility, @TODO: can be removed in 5.0
error_reporting(E_ALL);
ini_set('display_errors', 1);
break;
case 'development':
error_reporting(-1);
ini_set('display_errors', 1);
break;
default:
error_reporting($config->error_reporting);
ini_set('display_errors', 1);

1
administrator/language/en-GB/com_config.ini
View File

@ -146,7 +146,6 @@ COM_CONFIG_FIELD_VALUE_BEFORE="Before"
COM_CONFIG_FIELD_VALUE_CACHE_OFF="OFF - Caching disabled"
COM_CONFIG_FIELD_VALUE_CACHE_CONSERVATIVE="ON - Conservative caching"
COM_CONFIG_FIELD_VALUE_CACHE_PROGRESSIVE="ON - Progressive caching"
COM_CONFIG_FIELD_VALUE_DEVELOPMENT="Development"
COM_CONFIG_FIELD_VALUE_DISPLAY_OFFLINE_MESSAGE_CUSTOM="Use Custom Message"
COM_CONFIG_FIELD_VALUE_DISPLAY_OFFLINE_MESSAGE_LANGUAGE="Use Site Language Default Message"
COM_CONFIG_FIELD_VALUE_ENTIRE_SITE="Entire Site"

7
api/includes/framework.php
View File

@ -66,17 +66,12 @@ switch ($config->error_reporting)
break;
case 'maximum':
case 'development': // <= Stays for backward compatibility, @TODO: can be removed in 5.0
error_reporting(E_ALL);
ini_set('display_errors', 1);
break;
case 'development':
error_reporting(-1);
ini_set('display_errors', 1);
break;
default:
error_reporting($config->error_reporting);
ini_set('display_errors', 1);

7
includes/framework.php
View File

@ -61,17 +61,12 @@ switch ($config->error_reporting)
break;
case 'maximum':
case 'development': // <= Stays for backward compatibility, @TODO: can be removed in 5.0
error_reporting(E_ALL);
ini_set('display_errors', 1);
break;
case 'development':
error_reporting(-1);
ini_set('display_errors', 1);
break;
default:
error_reporting($config->error_reporting);
ini_set('display_errors', 1);