diff options
author | sgiehl <stefan@matomo.org> | 2020-02-24 11:18:50 +0300 |
---|---|---|
committer | sgiehl <stefan@matomo.org> | 2020-02-24 11:18:50 +0300 |
commit | 31dcb9dbb01460bf9a68dc8b7bc826a05c367f74 (patch) | |
tree | e7dbaf14fb8cf8e34f421df53e22fc88b1b7b0c2 /libs | |
parent | 92e1b8bc5b8baa7683e4aa7a6abdd40064cd448b (diff) | |
parent | 7c517de3c74b8417230d813ae35e6b5eba06605e (diff) |
Merge branch '3.x-dev' into 4.x-dev
Diffstat (limited to 'libs')
-rw-r--r-- | libs/HTML/QuickForm2/Element/Date.php | 2 | ||||
-rw-r--r-- | libs/Zend/Session.php | 2 | ||||
-rw-r--r-- | libs/Zend/Validate/Isbn.php | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/libs/HTML/QuickForm2/Element/Date.php b/libs/HTML/QuickForm2/Element/Date.php index b7e620691b..6a3dca2429 100644 --- a/libs/HTML/QuickForm2/Element/Date.php +++ b/libs/HTML/QuickForm2/Element/Date.php @@ -128,7 +128,7 @@ class HTML_QuickForm2_Element_Date extends HTML_QuickForm2_Container_Group $separator = ''; for ($i = 0, $length = strlen($this->data['format']); $i < $length; $i++) { - $sign = $this->data['format']{$i}; + $sign = $this->data['format'][$i]; if ($backslash) { $backslash = false; $separator .= $sign; diff --git a/libs/Zend/Session.php b/libs/Zend/Session.php index 3f21dcd9e6..21451e0ffa 100644 --- a/libs/Zend/Session.php +++ b/libs/Zend/Session.php @@ -523,6 +523,8 @@ class Zend_Session extends Zend_Session_Abstract self::$_sessionStarted = true; if (self::$_regenerateIdState === -1) { self::regenerateId(); + } else { + self::rewriteSessionCookieWithSameSiteDirective(); } if (isset($_SESSION['data']) && is_string($_SESSION['data'])) { diff --git a/libs/Zend/Validate/Isbn.php b/libs/Zend/Validate/Isbn.php index 980afc7f7a..2edf21d1dd 100644 --- a/libs/Zend/Validate/Isbn.php +++ b/libs/Zend/Validate/Isbn.php @@ -168,7 +168,7 @@ class Zend_Validate_Isbn extends Zend_Validate_Abstract $isbn10 = str_replace($this->_separator, '', $value); $sum = 0; for ($i = 0; $i < 9; $i++) { - $sum += (10 - $i) * $isbn10{$i}; + $sum += (10 - $i) * $isbn10[$i]; } // checksum @@ -186,9 +186,9 @@ class Zend_Validate_Isbn extends Zend_Validate_Abstract $sum = 0; for ($i = 0; $i < 12; $i++) { if ($i % 2 == 0) { - $sum += $isbn13{$i}; + $sum += $isbn13[$i]; } else { - $sum += 3 * $isbn13{$i}; + $sum += 3 * $isbn13[$i]; } } // checksum |