Commit 09d2b0b3 authored by Gold's avatar Gold
Browse files

Bug 2003378: PHP8 Compatibility: ini directives 



These are deprecated.  The one that has the phpcs:ignore is present in
the version of php that is also checked for so I've left that.

Signed-off-by: default avatarGold <gold@catalyst.net.nz>
Change-Id: Ic1203e92c5616f7bb845ad700f2a51edc7aa7131
parent acca4c03

htdocs/lib/upgrade.php

+1 −0
Original line number Diff line number Diff line
@@ -1483,6 +1483,7 @@ function site_warnings() { 
    }



    // Check for low security (i.e. not random enough) session IDs

    // phpcs:ignore

    if (version_compare(PHP_VERSION, '7.1.0') < 0 && (int)ini_get('session.entropy_length') < 16) {

        $warnings[] = get_string('notenoughsessionentropy', 'error');

    }

htdocs/webservice/rest/locallib.php

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ function webservice_download_file_content($url, $headers=null, $postdata=null, $ 
    $options[CURLOPT_HEADER] = false;

    $options[CURLOPT_CONNECTTIMEOUT] = $connecttimeout;



    if (!ini_get('open_basedir') and !ini_get('safe_mode')) {

    if (!ini_get('open_basedir')) {

        // TODO: add version test for '7.10.5'

        $options[CURLOPT_FOLLOWLOCATION] = true;

        $options[CURLOPT_MAXREDIRS] = 5;