Commit 09d05944 authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1812910: Needs to use is_array() before count() in PHP 7.2 



Fixing up some more places, like elasticsearch results, where we are
trying to get a cound on a variable that is not an array

behatnotneeded

Change-Id: I09b809240f18892a187c5e5ed2a3d1756e39b247
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit ef57506f)
parent 1261963a

htdocs/admin/groups/archives.php

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ $smarty = smarty(array('adminusersearch', 'adminexportqueue','paginator'), array 
setpageicon($smarty, 'icon-users');

$smarty->assign('search', $search);

$smarty->assign('limit', $limit);

$smarty->assign('institutions', $institutions);

$smarty->assign('institutions', !empty($institutions) ? $institutions : array());

$smarty->assign('results', $html);

$smarty->assign('pagination', $pagination['html']);

$smarty->assign('columns', $columns);

htdocs/admin/groups/uploadmemberscsv.php

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ $MANDATORYFIELDS = array( 
);

$MEMBERS = array(); // Store the members

$GROUPS = array(); // Map gid to group shortnames

$UPDATES = array(); // During validation, remember which group already exist



$form = array(

    'name' => 'uploadcsv',

htdocs/admin/users/bulk.php

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ $users = get_records_sql_assoc(' 
    $ph

);



if (empty($users)) {

    // None of the userids are valid

    throw new InvalidArgumentException("Trying to access invalid user(s)");

}

// Display the number of users filtered out due to institution permissions.  This is not an

// exception, because the logged in user might be an admin in one institution, and staff in

// another.

htdocs/admin/users/exportqueue.php

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ $smarty = smarty(array('adminexportqueue', 'paginator'), array(), array('ascendi 
setpageicon($smarty, 'icon-user');

$smarty->assign('search', $search);

$smarty->assign('limit', $limit);

$smarty->assign('institutions', $institutions);

$smarty->assign('institutions', !empty($institutions) ? $institutions : array());

$smarty->assign('results', $html);

$smarty->assign('pagination', $pagination['html']);

$smarty->assign('columns', $columns);

htdocs/theme/raw/plugintype/artefact/internal/export/html/templates/index.tpl

+21 −21
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
{if $icon}<div id="profile-icon">{$icon|safe}</div>{/if}



{foreach from=$sections key=sectionname item=section}

{if count($section)}

    {if is_array($section) && count($section)}

        <div class="profileinfo">

            <h3>{str tag=$sectionname section=artefact.internal}</h3>

            <table>