Skip to content

Commit

Permalink
Merge pull request #337 from JarvusInnovations/develop
Browse files Browse the repository at this point in the history
Release: v1.20.2
  • Loading branch information
themightychris authored Mar 22, 2022
2 parents c83a479 + bcf199b commit cd87f27
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 1 deletion.
33 changes: 33 additions & 0 deletions api.http
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
@baseUrl = http://localhost:7080

###

# @name login
POST {{baseUrl}}/login HTTP/1.1
Accept: application/json
Content-Type: application/x-www-form-urlencoded

_LOGIN[username]=system
&_LOGIN[password]=system
&_LOGIN[returnMethod]=POST

###

# @name listPeople
GET {{baseUrl}}/people HTTP/1.1
Authorization: Token {{login.response.body.$.data.Handle}}
Accept: application/json

###

# @name getPerson
GET {{baseUrl}}/people/system HTTP/1.1
Authorization: Token {{login.response.body.$.data.Handle}}
Accept: application/json

###

# @name getPersonEdit
GET {{baseUrl}}/people/system/edit HTTP/1.1
Authorization: Token {{login.response.body.$.data.Handle}}
Accept: application/json
4 changes: 3 additions & 1 deletion php-classes/ActiveRecord.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -2371,7 +2371,9 @@ protected function _setFieldValue($field, $value)
$offsetTimezone = static::getDatabaseOffsetTimezone();

if ($offsetTimezone) {
$offsetTimezone = new DateTimeZone($offsetTimezone);
// $offsetTimezone = new DateTimeZone($offsetTimezone);
// work around PHP 5.5 bug (fixed in 5.6): https://stackoverflow.com/a/14069062/964125
$offsetTimezone = DateTime::createFromFormat('O', $offsetTimezone)->getTimezone();
}
}

Expand Down

0 comments on commit cd87f27

Please sign in to comment.