Merge "Installer: Link 4.0 family of CC licenses"

diff --combined includes/installer/Installer.php
index ba0e38f,1841670..b863adc
--- 1/includes/installer/Installer.php
--- 2/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@@ -164,6 -164,7 +164,6 @@@ abstract class Installer 
                'wgRightsIcon',
                'wgRightsText',
                'wgRightsUrl',
 -              'wgMainCacheType',
                'wgEnableEmail',
                'wgEnableUserEmail',
                'wgEnotifUserTalk',
@@@ -281,15 -282,15 +281,15 @@@
         */
        public $licenses = array(
                'cc-by' => array(
-                       'url' => 'https://creativecommons.org/licenses/by/3.0/',
+                       'url' => 'https://creativecommons.org/licenses/by/4.0/',
                        'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-by.png',
                ),
                'cc-by-sa' => array(
-                       'url' => 'https://creativecommons.org/licenses/by-sa/3.0/',
+                       'url' => 'https://creativecommons.org/licenses/by-sa/4.0/',
                        'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-by-sa.png',
                ),
                'cc-by-nc-sa' => array(
-                       'url' => 'https://creativecommons.org/licenses/by-nc-sa/3.0/',
+                       'url' => 'https://creativecommons.org/licenses/by-nc-sa/4.0/',
                        'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-by-nc-sa.png',
                ),
                'cc-0' => array(
@@@ -690,6 -691,17 +690,6 @@@
                return Status::newGood();
        }
  
 -      /**
 -       * Exports all wg* variables stored by the installer into global scope.
 -       */
 -      public function exportVars() {
 -              foreach ( $this->settings as $name => $value ) {
 -                      if ( substr( $name, 0, 2 ) == 'wg' ) {
 -                              $GLOBALS[$name] = $value;
 -                      }
 -              }
 -      }
 -
        /**
         * Environment check for DB types.
         * @return bool