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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 ) { $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); + } };