Warning produced when adding/ editing an image gallery block

[Lisa Seeto]

A warning message is being produced when adding or editing an image gallery block (see attached screenshot)

To reproduce:
1) Log in as any user and create a page
2) Edit the page and select image gallery block, select some images, press save
expected results:
The page displays with an image gallery and no warnings
actual results:
The page displays with an image gallery and warnings:
"[WAR] 98 (blocktype/lib.php:2104) stripos() expects parameter 1 to be string, array given"

This issue is occurring because the javascript function get_get_javascript_javascript($jsfiles) in blocktype/lib.php has been set up to expect a non-empty file entry in its logic in its foreach loop. This is an issue in artefact/file/blocktype/gallery/lib.php in get_instance_javascript() which passes down an array with an empty file entry:

            array(
                'file' => '',
                'initjs' => "$('#slideshow{$blockid}').on('slid.bs.carousel', function () {
                    $(window).trigger('colresize');
                });"
            )
The get_get_javascript_javascript($jsfiles) should be amended to handle the above input.

Version: 20.04dev

[Mahara Bot (dev-mahara)]

Patch for "master" branch: https://reviews.mahara.org/10658

[Mahara Bot (dev-mahara)]

Patch for "19.10_STABLE" branch: https://reviews.mahara.org/10675

[Mahara Bot (dev-mahara)]

Reviewed: https://reviews.mahara.org/10658
Committed: https://git.mahara.org/mahara/mahara/commit/a5012e5cdc22dc91770616e68f1b089157579b41
Submitter: Cecilia Vela Gurovic (<email address hidden>)
Branch: master

commit a5012e5cdc22dc91770616e68f1b089157579b41
Author: Lisa Seeto <email address hidden>
Date: Mon Dec 9 11:28:09 2019 +1300

Bug 1855023: Warning produced when adding/ editing an image gallery block

- changed for loop in get_get_javascript_javascript func to continue
when encountering empty filename vars.

behatnotneeded

Change-Id: I5b65c4beee4465d80911aa3fe08590a358570141
Signed-off-by: Lisa Seeto <email address hidden>

[Mahara Bot (dev-mahara)]

Reviewed: https://reviews.mahara.org/10675
Committed: https://git.mahara.org/mahara/mahara/commit/a3aa7b0acbbb77517ee148ec726a45bdbe52b9a4
Submitter: Cecilia Vela Gurovic (<email address hidden>)
Branch: 19.10_STABLE

commit a3aa7b0acbbb77517ee148ec726a45bdbe52b9a4
Author: Lisa Seeto <email address hidden>
Date: Mon Dec 9 11:28:09 2019 +1300

Bug 1855023: Warning produced when adding/ editing an image gallery block

- changed for loop in get_get_javascript_javascript func to continue
when encountering empty filename vars.

behatnotneeded

Change-Id: I5b65c4beee4465d80911aa3fe08590a358570141
Signed-off-by: Lisa Seeto <email address hidden>