Skip to content

Upgrade to version 23 and fix warnings & errors #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcboule98 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Upgrade to version 23 and fix warnings & errors #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3188d67
feat: upgrade to version 23 and fix warnings and errors
Oct 11, 2023
73f92a6
fix: donava error en alguns casos que no havien dades
Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion artefact/annotation/blocktype/annotation/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
global $USER;

$instance->set('artefactplugin', 'annotation');
Expand Down
2 changes: 1 addition & 1 deletion artefact/blog/blocktype/blog/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
global $USER;
safe_require('artefact', 'blog');
$configdata = $instance->get('configdata');
Expand Down
2 changes: 1 addition & 1 deletion artefact/blog/blocktype/blogpost/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
global $USER;
safe_require('artefact', 'blog');
$configdata = $instance->get('configdata');
Expand Down
2 changes: 1 addition & 1 deletion artefact/blog/blocktype/recentposts/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
safe_require('artefact', 'blog');
$configdata = $instance->get('configdata');
$elements = array(self::artefactchooser_element((isset($configdata['artefactids'])) ? $configdata['artefactids'] : null),
Expand Down
2 changes: 1 addition & 1 deletion artefact/blog/blocktype/taggedposts/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
global $USER;
safe_require('artefact', 'blog');
$configdata = $instance->get('configdata');
Expand Down
2 changes: 1 addition & 1 deletion artefact/comment/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ public static function last_public_comment($view=null, $artefact=null) {
WHERE c.private = 0 AND c.hidden = 0 AND ' . $where . '
ORDER BY a.ctime DESC', $values, 0, 1
);
return $newest[0];
return is_array($newest) ? $newest[0] : null;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion artefact/file/blocktype/filedownload/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');
safe_require('artefact', 'file');
$instance->set('artefactplugin', 'file');
Expand Down
2 changes: 1 addition & 1 deletion artefact/file/blocktype/folder/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');
safe_require('artefact', 'file');
$instance->set('artefactplugin', 'file');
Expand Down
2 changes: 1 addition & 1 deletion artefact/file/blocktype/gallery/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');
safe_require('artefact', 'file');
$instance->set('artefactplugin', 'file');
Expand Down
2 changes: 1 addition & 1 deletion artefact/file/blocktype/html/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');
safe_require('artefact', 'file');
$instance->set('artefactplugin', 'file');
Expand Down
2 changes: 1 addition & 1 deletion artefact/file/blocktype/image/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');
safe_require('artefact', 'file');
$instance->set('artefactplugin', 'file');
Expand Down
2 changes: 1 addition & 1 deletion artefact/file/blocktype/internalmedia/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');
safe_require('artefact', 'file');
$instance->set('artefactplugin', 'file');
Expand Down
2 changes: 1 addition & 1 deletion artefact/file/blocktype/pdf/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');
safe_require('artefact', 'file');
$instance->set('artefactplugin', 'file');
Expand Down
2 changes: 1 addition & 1 deletion artefact/internal/blocktype/profileinfo/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');

$form = array();
Expand Down
2 changes: 1 addition & 1 deletion artefact/internal/blocktype/socialprofile/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');
$owner = $instance->get_view()->get('owner');
$form = array();
Expand Down
2 changes: 1 addition & 1 deletion artefact/internal/blocktype/textbox/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
global $USER;
require_once('license.php');
safe_require('artefact', 'file');
Expand Down
2 changes: 1 addition & 1 deletion artefact/peerassessment/blocktype/peerassessment/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');
if (!$height = get_config('blockeditorheight')) {
$cfheight = param_integer('cfheight', 0);
Expand Down
2 changes: 1 addition & 1 deletion artefact/peerassessment/blocktype/signoff/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');
$elements = array (
'signoff' => array (
Expand Down
2 changes: 1 addition & 1 deletion artefact/plans/blocktype/plans/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$instance->set('artefactplugin', 'plans');
$configdata = $instance->get('configdata');
$owner = $instance->get_view()->get('owner');
Expand Down
2 changes: 1 addition & 1 deletion artefact/resume/blocktype/entireresume/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$owner = $instance->get_view()->get('owner');
if ($owner) {
$elements = array(
Expand Down
2 changes: 1 addition & 1 deletion artefact/resume/blocktype/resumefield/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');

$form = array();
Expand Down
2 changes: 1 addition & 1 deletion blocktype/creativecommons/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public static function instance_config_save($values) {
return $values;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
global $THEME;
$configdata = $instance->get('configdata');
$noderivatives = 1;
Expand Down
2 changes: 1 addition & 1 deletion blocktype/externalfeed/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');

if (!empty($configdata['feedid'])) {
Expand Down
2 changes: 1 addition & 1 deletion blocktype/externalvideo/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');

return array(
Expand Down
2 changes: 1 addition & 1 deletion blocktype/googleapps/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');

return array(
Expand Down
2 changes: 1 addition & 1 deletion blocktype/groupmembers/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');

$options = range(0,100);
Expand Down
2 changes: 1 addition & 1 deletion blocktype/groupviews/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');
return array(
'showgroupviews' => array(
Expand Down
2 changes: 1 addition & 1 deletion blocktype/inbox/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
global $USER;
$configdata = $instance->get('configdata');

Expand Down
2 changes: 1 addition & 1 deletion blocktype/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ public static function delete_instance(BlockInstance $instance) { }
/**
* This function must be implemented in the subclass if it has config
*/
public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
throw new SystemException(get_string('blocktypemissingconfigform', 'error', $instance->get('blocktype')));
}

Expand Down
2 changes: 1 addition & 1 deletion blocktype/mygroups/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');

return array(
Expand Down
2 changes: 1 addition & 1 deletion blocktype/navigation/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');

$view = $instance->get_view();
Expand Down
2 changes: 1 addition & 1 deletion blocktype/newviews/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');
return array('limit' => array(
'type' => 'text',
Expand Down
2 changes: 1 addition & 1 deletion blocktype/openbadgedisplayer/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
global $USER;
$owner = $instance->get_view()->get('owner');
$sources = self::get_backpack_source();
Expand Down
2 changes: 1 addition & 1 deletion blocktype/placeholder/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
global $USER;

$view = $instance->get_view();
Expand Down
2 changes: 1 addition & 1 deletion blocktype/recentforumposts/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
global $USER;

$elements = array();
Expand Down
2 changes: 1 addition & 1 deletion blocktype/text/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
require_once('license.php');
$configdata = $instance->get('configdata');
if (!$height = get_config('blockeditorheight')) {
Expand Down
2 changes: 1 addition & 1 deletion blocktype/watchlist/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public static function get_instance_config_javascript(BlockInstance $instance) {
return array('js/configform.js');
}

public static function instance_config_form(BlockInstance $instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');
$classes = 'first last';
if (!isset($configdata) || (isset($configdata['mode']) && $configdata['mode'] == 'watchlist')) {
Expand Down
2 changes: 1 addition & 1 deletion lib/form/elements/filebrowser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function pieform_element_filebrowser(Pieform $form, $element) {
$smarty->assign('folder', $folder);
$smarty->assign('foldername', $path[0]->title);
$smarty->assign('path', array_reverse($path));
$smarty->assign('highlight', $element['highlight'][0]);
$smarty->assign('highlight', is_array($element['highlight']) ? $element['highlight'][0]: null);
$smarty->assign('edit', !empty($element['edit']) ? $element['edit'] : -1);
if (isset($element['browse'])) {
$smarty->assign('browse', (int) $element['browse']);
Expand Down
6 changes: 3 additions & 3 deletions lib/version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
// See https://wiki.mahara.org/wiki/Developer_Area/Version_Numbering_Policy
// For upgrades on stable branches, increment the version by one. On master, use the date.

$config->version = 2019093025;
$config->series = '19.10';
$config->release = '19.10.6';
$config->version = 2023100100;
$config->series = '23.04';
$config->release = '23.04.0';
$config->minupgradefrom = 2017031605;
$config->minupgraderelease = '17.04.0 (release tag 17.04.0_RELEASE)';
2 changes: 1 addition & 1 deletion opt/europass/blocktype/europasscv/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form($instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');
$locale = (isset($configdata['locale']) ? $configdata['locale'] : get_config('lang'));
$profilepic = (isset($configdata['profilepic']) ? $configdata['profilepic'] : false);
Expand Down
2 changes: 1 addition & 1 deletion opt/europass/blocktype/europassfield/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form($instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');

return array(
Expand Down
2 changes: 1 addition & 1 deletion opt/europass/blocktype/europasslp/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form($instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');
$locale = (isset($configdata['locale']) ? $configdata['locale'] : get_config('lang'));

Expand Down
2 changes: 1 addition & 1 deletion opt/europass/blocktype/mylanguages/lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public static function has_instance_config() {
return true;
}

public static function instance_config_form($instance) {
public static function instance_config_form(BlockInstance $instance, $istemplate) {
$configdata = $instance->get('configdata');

return array(
Expand Down
1 change: 1 addition & 0 deletions opt/europass/languages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@

// Delete mother tongue(s) form
$elements = array();
$mothertongue_data = is_array($mothertongue_data) ? $mothertongue_data : array();
foreach ($mothertongue_data as $lang) {
$elements[$lang->description] = array(
'type' => 'checkbox',
Expand Down
Loading