Commit a26871c3 authored by Robert Lyon's avatar Robert Lyon Committed by Aaron Wells
Browse files

Bug 1571910: Set placeholder cacheversion before upgrade 



Allow get_config to supply a default so that system can handle misisng
config values during upgrade from older sites that are meant to be set
duing upgrade, eg 'cacheversion'

behatnotneeded - upgrade issue

Change-Id: Ieaea390d57c18f3bc3e0808026ec1e76636bcc15
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit d7c297f1)
parent 40d2158d

htdocs/admin/site/options.php

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ $siteoptionform = array( 
                    'type' => 'switchbox',

                    'title' => get_string('recaptchaonregisterform', 'admin'),

                    'description' => get_string('recaptchaonregisterformdesc1', 'admin'),

                    'defaultvalue' => get_config('recaptchaonregisterform', 'admin'),

                    'defaultvalue' => get_config('recaptchaonregisterform'),

                    'help' => true,

                    'disabled' => in_array('recaptchaonregisterform', $OVERRIDDEN)

                ),

htdocs/lib/mahara.php

+5 −4
Original line number Diff line number Diff line
@@ -913,17 +913,18 @@ function load_config() { 


/**

 * This function returns a value from $CFG

 * or null if it is not found

 * or default value if supplied or null if it is not found

 *

 * @param string $key config setting to look for

 * @param string $key      Config setting to look for

 * @param string $default  Default value to return if setting not found

 * @return mixed

 */

function get_config($key) {

function get_config($key, $default = null) {

    global $CFG;

    if (isset($CFG->$key)) {

        return $CFG->$key;

    }

    return null;

    return $default;

}

htdocs/lib/web.php

+8 −8
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ EOF; 
    $smarty->assign_by_ref('JAVASCRIPT', $javascript_array);

    $smarty->assign('RELEASE', get_config('release'));

    $smarty->assign('SERIES', get_config('series'));

    $smarty->assign('CACHEVERSION', get_config('cacheversion'));

    $smarty->assign('CACHEVERSION', get_config('cacheversion', 0));

    if (get_config('siteclosedforupgrade')) {

        $smarty->assign('SITECLOSED', 'logindisabled');

    }
@@ -3604,7 +3604,7 @@ function clean_html($text, $xhtml=false) { 
    // $config->set('Cache.DefinitionImpl', null);



    $config->set('HTML.DefinitionID', 'Mahara customisations to default config');

    $config->set('HTML.DefinitionRev', get_config('cacheversion'));

    $config->set('HTML.DefinitionRev', get_config('cacheversion', 0));



    $config->set('Cache.SerializerPermissions', get_config('directorypermissions'));

    $config->set('Cache.SerializerPath', get_config('dataroot') . 'htmlpurifier');
@@ -3726,8 +3726,8 @@ function clean_css($input_css, $preserve_css=false) { 
    // $config->set('Cache.DefinitionImpl', null);



    $config->set('HTML.DefinitionID', 'Mahara customisations to default config for CSS');

    $config->set('HTML.DefinitionRev', get_config('cacheversion'));

    $config->set('CSS.DefinitionRev', get_config('cacheversion'));

    $config->set('HTML.DefinitionRev', get_config('cacheversion', 0));

    $config->set('CSS.DefinitionRev', get_config('cacheversion', 0));



    $config->set('Cache.SerializerPermissions', get_config('directorypermissions'));

    $config->set('Cache.SerializerPath', get_config('dataroot') . 'htmlpurifier');
@@ -4591,20 +4591,20 @@ function append_version_number($urls) { 
        $formattedurls = array();

        foreach ($urls as $url) {

            if (preg_match('/\?/',$url)) {

                $url .= '&v=' . get_config('cacheversion');

                $url .= '&v=' . get_config('cacheversion', 0);

            }

            else {

                $url .= '?v=' . get_config('cacheversion');

                $url .= '?v=' . get_config('cacheversion', 0);

            }

            $formattedurls[] = $url;

        }

        return $formattedurls;

    }

    if (preg_match('/\?/',$urls)) {

        $urls .= '&v=' . get_config('cacheversion');

        $urls .= '&v=' . get_config('cacheversion', 0);

    }

    else {

        $urls .= '?v=' . get_config('cacheversion');

        $urls .= '?v=' . get_config('cacheversion', 0);

    }

    return $urls;

}