Skip to content

Commit

Permalink
One more error related to 8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
csev committed Jan 22, 2024
1 parent 00a262b commit 53d753e
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

"nesbot/carbon" : "2.68.1",

"tsugi/lib": "dev-master#175e4550fd1dfa3be34deda138de9f69cd3ec2d3",
"tsugi/lib": "dev-master#e066074808929c1f426e6adc82702acc4009bc20",
"koseu/lib": "dev-master#70c7ac1ca413c2dd541e078ebe07719405621b1b"
},
"config": {
Expand Down
10 changes: 5 additions & 5 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -7511,12 +7511,12 @@
"source": {
"type": "git",
"url": "https://github.com/tsugiproject/tsugi-php.git",
"reference": "175e4550fd1dfa3be34deda138de9f69cd3ec2d3"
"reference": "e066074808929c1f426e6adc82702acc4009bc20"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/175e4550fd1dfa3be34deda138de9f69cd3ec2d3",
"reference": "175e4550fd1dfa3be34deda138de9f69cd3ec2d3",
"url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/e066074808929c1f426e6adc82702acc4009bc20",
"reference": "e066074808929c1f426e6adc82702acc4009bc20",
"shasum": ""
},
"require": {
Expand All @@ -7529,7 +7529,7 @@
"phpunit/php-timer": "v5.0.3",
"phpunit/phpunit": "9.*"
},
"time": "2024-01-20T06:30:30+00:00",
"time": "2024-01-22T11:02:35+00:00",
"default-branch": true,
"type": "library",
"installation-source": "dist",
Expand Down
6 changes: 3 additions & 3 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'name' => '__root__',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'ffc437da39f2104f8922035db0d4d4b3148b126c',
'reference' => '00a262ba539400c7ba097dd436a30dd2a1533ed4',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand All @@ -13,7 +13,7 @@
'__root__' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'ffc437da39f2104f8922035db0d4d4b3148b126c',
'reference' => '00a262ba539400c7ba097dd436a30dd2a1533ed4',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand Down Expand Up @@ -1045,7 +1045,7 @@
'tsugi/lib' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '175e4550fd1dfa3be34deda138de9f69cd3ec2d3',
'reference' => 'e066074808929c1f426e6adc82702acc4009bc20',
'type' => 'library',
'install_path' => __DIR__ . '/../tsugi/lib',
'aliases' => array(
Expand Down
4 changes: 2 additions & 2 deletions vendor/tsugi/lib/src/Core/LTIX.php
Original file line number Diff line number Diff line change
Expand Up @@ -796,11 +796,11 @@ public static function setupSession($needed=self::ALL, $session_object=null, $re
self::wrapped_session_put($session_object, 'HTTP_USER_AGENT', $_SERVER['HTTP_USER_AGENT']);
}
$ipaddr = Net::getIP();
if ( $ipaddr ) {
if ( is_string($ipaddr) ) {
self::wrapped_session_put($session_object, 'REMOTE_ADDR', $ipaddr);
// Check our list of IP address history
// TODO: decrypt
$iphistory = U::get($_COOKIE, "TSUGI-HISTORY");
$iphistory = U::get($_COOKIE, "TSUGI-HISTORY",'');
// Add this IP Address to the Tsugi IP History if it is not there
if ( strpos($iphistory, $ipaddr) === false ) {
$iphistory .= '!' . $ipaddr;
Expand Down

0 comments on commit 53d753e

Please sign in to comment.