From c2f7073dd4a93fd6892397acf5f6be5a15e6cbcf Mon Sep 17 00:00:00 2001 From: Fredrick Brennan Date: Sun, 5 Nov 2017 21:17:20 +0800 Subject: [PATCH] Fix warnings in PHP7 in gettext library Not sure how to commit this upstream, the library seems to be unmaintained. --- inc/lib/gettext/.gettext.php.swp | Bin 0 -> 28672 bytes inc/lib/gettext/gettext.php | 5 ++++- inc/lib/gettext/streams.php | 18 +++++++++++++++--- 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 inc/lib/gettext/.gettext.php.swp diff --git a/inc/lib/gettext/.gettext.php.swp b/inc/lib/gettext/.gettext.php.swp new file mode 100644 index 0000000000000000000000000000000000000000..5d951f49634c6a8e823b2faebb4c4b2e49d0ce49 GIT binary patch literal 28672 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 A(EtDd literal 0 HcmV?d00001 diff --git a/inc/lib/gettext/gettext.php b/inc/lib/gettext/gettext.php index 5064047c..f93532b5 100755 --- a/inc/lib/gettext/gettext.php +++ b/inc/lib/gettext/gettext.php @@ -98,7 +98,7 @@ class gettext_reader { * @param object Reader the StreamReader object * @param boolean enable_cache Enable or disable caching of strings (default on) */ - function gettext_reader($Reader, $enable_cache = true) { + function __construct($Reader, $enable_cache = true) { // If there isn't a StreamReader, turn on short circuit mode. if (! $Reader || isset($Reader->error) ) { $this->short_circuit = true; @@ -129,6 +129,9 @@ class gettext_reader { $this->originals = $this->readint(); $this->translations = $this->readint(); } + function gettext_reader($Reader, $enable_cache = true) { + self::__construct($Reader, $enable_cache); + } /** * Loads the translation tables from the MO file into the cache diff --git a/inc/lib/gettext/streams.php b/inc/lib/gettext/streams.php index 3cdc1584..4b68f743 100644 --- a/inc/lib/gettext/streams.php +++ b/inc/lib/gettext/streams.php @@ -49,11 +49,15 @@ class StringReader { var $_pos; var $_str; - function StringReader($str='') { + function __construct($str='') { $this->_str = $str; $this->_pos = 0; } + function StringReader($str='') { + self::__construct($str); + } + function read($bytes) { $data = substr($this->_str, $this->_pos, $bytes); $this->_pos += $bytes; @@ -86,7 +90,7 @@ class FileReader { var $_fd; var $_length; - function FileReader($filename) { + function __construct($filename) { if (file_exists($filename)) { $this->_length=filesize($filename); @@ -102,6 +106,10 @@ class FileReader { } } + function FileReader($filename) { + self::__construct($filename); + } + function read($bytes) { if ($bytes) { fseek($this->_fd, $this->_pos); @@ -143,7 +151,7 @@ class FileReader { // Preloads entire file in memory first, then creates a StringReader // over it (it assumes knowledge of StringReader internals) class CachedFileReader extends StringReader { - function CachedFileReader($filename) { + function __construct($filename) { if (file_exists($filename)) { $length=filesize($filename); @@ -161,6 +169,10 @@ class CachedFileReader extends StringReader { return false; } } + + function CachedFileReader($filename) { + self::__construct($filename); + } };