Fix the sorting of fields and views for PHP 8

This commit is contained in:
2023-05-17 00:20:41 +02:00
parent df16b2e3ad
commit a325339501
9 changed files with 155 additions and 155 deletions

View File

@ -1325,7 +1325,7 @@ class Fields extends Structure
}
}
// fix the permissions field "title" issue gh-629
// check if the the title is not already set
// check if the title is not already set
if (!CFactory::_('Registry')->isString('builder.field_names.' . $nameSingleCode . '.title')
&& $this->hasPermissionsSet($view, $nameSingleCode))
{
@ -3982,7 +3982,7 @@ class Fields extends Structure
. $field['alignment'] . '.'
. $field['order_edit'], $name);
}
// check if default fields were over written
// check if default fields were overwritten
if (in_array($name, $default_fields))
{
// just to eliminate

View File

@ -4972,7 +4972,7 @@ class Interpretation extends Fields
public function setAdminViewDisplayMethod($nameListCode)
{
$script = '';
// add the the new filter methods for the search toolbar above the list view (2 = topbar)
// add the new filter methods for the search toolbar above the list view (2 = topbar)
if (CFactory::_('Registry')->
get('builder.admin_filter_type.' . $nameListCode, 1) == 2)
{
@ -11129,7 +11129,7 @@ class Interpretation extends Fields
$body .= PHP_EOL . Indent::_(1) . "?>";
$body .= PHP_EOL . Indent::_(1)
. '<tr class="row<?php echo $i % 2; ?>">';
// only load if not over written
// only load if not overwritten
if (!CFactory::_('Registry')->isString('builder.field_names.' . $nameSingleCode . '.ordering'))
{
$body .= PHP_EOL . Indent::_(2)
@ -11236,7 +11236,7 @@ class Interpretation extends Fields
$item, $nameSingleCode, $nameListCode, $itemClass,
$doNotEscape, $coreLoad, $core
);
// check if buttons was aready added
// check if buttons was already added
if ($firstTimeBeingAdded) // TODO we must improve this to allow more items to be targeted instead of just the first item :)
{
// get custom admin view buttons