Bug 1962218: Upgrade HTML Purifier from 4.13.0 to 4.14.0 (e0a8c9eb) · Commits · mahara / mahara

htdocs/lib/htmlpurifier/HTMLPurifier.autoload-legacy.php

+14 −15

Original line number	Diff line number	Diff line
		@@ -4,12 +4,11 @@
		* @file
		* Legacy autoloader for systems lacking spl_autoload_register
		*
		* Must be separate to prevent deprecation warning on PHP 7.2
		*/

		function __autoload($class)
		spl_autoload_register(function($class)
		{
		return HTMLPurifier_Bootstrap::autoload($class);
		}
		});

		// vim: et sw=4 sts=4

+25 −24

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ if (function_exists('spl_autoload_register') && function_exists('spl_autoload_un
		require dirname(__FILE__) . '/HTMLPurifier.autoload-legacy.php';
		}

		// phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.zend_ze1_compatibility_modeRemoved
		if (ini_get('zend.ze1_compatibility_mode')) {
		trigger_error("HTML Purifier is not compatible with zend.ze1_compatibility_mode; please turn it off", E_USER_ERROR);
		}

+234 −234

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		* primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
		* FILE, changes will be overwritten the next time the script is run.
		*
		* @version 4.13.0
		* @version 4.14.0
		*
		* @warning
		* You must not include any other HTML Purifier files before this file,

+297 −297

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		*/

		/*
		HTML Purifier 4.13.0 - Standards Compliant HTML Filtering
		HTML Purifier 4.14.0 - Standards Compliant HTML Filtering
		Copyright (C) 2006-2008 Edward Z. Yang

		This library is free software; you can redistribute it and/or
		@@ -58,12 +58,12 @@ class HTMLPurifier
		* Version of HTML Purifier.
		* @type string
		*/
		public $version = '4.13.0';
		public $version = '4.14.0';

		/**
		* Constant with version of HTML Purifier.
		*/
		const VERSION = '4.13.0';
		const VERSION = '4.14.0';

		/**
		* Global configuration object.

+113 −111

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
		$this->info['background-repeat'] = $def->info['background-repeat'];
		$this->info['background-attachment'] = $def->info['background-attachment'];
		$this->info['background-position'] = $def->info['background-position'];
		$this->info['background-size'] = $def->info['background-size'];
		}

		/**
		@@ -53,6 +54,7 @@ class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
		$caught['repeat'] = false;
		$caught['attachment'] = false;
		$caught['position'] = false;
		$caught['size'] = false;

		$i = 0; // number of catches