From 81f06b2ea0ca162aea58cb30cb4cca80b195d7f4 Mon Sep 17 00:00:00 2001 From: Mario Hommel Date: Wed, 8 May 2019 20:07:33 +0200 Subject: [PATCH] Fix compatibility of constructors for PHP7.2 in serendipity_event_geshi. --- serendipity_event_geshi/ChangeLog | 2 ++ serendipity_event_geshi/geshi.php | 10 +++++++++- serendipity_event_geshi/serendipity_event_geshi.php | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/serendipity_event_geshi/ChangeLog b/serendipity_event_geshi/ChangeLog index fcbc0da7..6271130e 100644 --- a/serendipity_event_geshi/ChangeLog +++ b/serendipity_event_geshi/ChangeLog @@ -1 +1,3 @@ +0.9.9: Fix constructor for compatibility with PHP7.2 + 0.7: Upgrade to Geshi 1.0.8.1 diff --git a/serendipity_event_geshi/geshi.php b/serendipity_event_geshi/geshi.php index a59e676e..5413faaf 100644 --- a/serendipity_event_geshi/geshi.php +++ b/serendipity_event_geshi/geshi.php @@ -588,7 +588,9 @@ class GeSHi { * {@link GeSHi->set_language_path()} * @since 1.0.0 */ - function GeSHi($source = '', $language = '', $path = '') { + + function __construct($source = '', $language = '', $path = '') { + if (!empty($source)) { $this->set_source($source); } @@ -598,6 +600,12 @@ class GeSHi { $this->set_language_path($path); } + + function GeSHi($source = '', $language = '', $path = '') { + self::__construct($source, $language, $path); + } + + /** * Returns an error message associated with the last GeSHi operation, * or false if no error has occured diff --git a/serendipity_event_geshi/serendipity_event_geshi.php b/serendipity_event_geshi/serendipity_event_geshi.php index efc1b07b..a7387e03 100644 --- a/serendipity_event_geshi/serendipity_event_geshi.php +++ b/serendipity_event_geshi/serendipity_event_geshi.php @@ -80,7 +80,7 @@ class serendipity_event_geshi extends serendipity_event 'smarty' => '2.6.7', 'php' => '4.1.0' )); - $propbag->add('version', '0.9'); + $propbag->add('version', '0.9.9'); $propbag->add('event_hooks', array('frontend_display' => true, 'frontend_comment' => true)); $propbag->add('groups', array('MARKUP')); @@ -199,4 +199,4 @@ class serendipity_event_geshi extends serendipity_event } } /* vim: set sts=4 ts=4 expandtab : */ -?> \ No newline at end of file +?>