Skip to content

merge master #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s-nakajima merged 3 commits into from
Jun 3, 2020
Merged

merge master #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8ad65e
change: test: travis.ymlからphp5.4,5.5を削除。php7.3,7.4を追加
s-nakajima Mar 8, 2020
f1e02b7
change: php7.4でNoticeが発生するため修正
s-nakajima Mar 14, 2020
71a8eef
fix: urlエンコードがされていなかったため、左(右)カラムに配置したアンケートから回答をダウンロードできない
s-nakajima Apr 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
language: php

php:
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1
- 7.2
- 7.3
- 7.4

sudo: required
dist: trusty
Expand Down
6 changes: 5 additions & 1 deletion Model/Behavior/AuthorizationKeyBehavior.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,11 @@ public function beforeDelete(Model $Model, $cascade = true) {
* @return void
*/
public function afterDelete(Model $Model) {
$contentId = $this->_deleteTargetData[$Model->alias]['id'];
if (isset($this->_deleteTargetData[$Model->alias]['id'])) {
$contentId = $this->_deleteTargetData[$Model->alias]['id'];
} else {
$contentId = null;
}
$AuthorizationKey = $this->_getModel();
$AuthorizationKey->cleanup($Model, $contentId);
}
Expand Down
2 changes: 1 addition & 1 deletion View/Helper/AuthKeyPopupButtonHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function popupButton($options) {
}
$html = '<a authorization-keys-popup-link frame-id="' . Current::read('Frame.id') . '" ' .
'class="' . $options['class'] . '" ' .
'url="' . $options['url'] . '" ' .
'url="' . rawurlencode($options['url']) . '" ' .
'popup-title="' . $options['popup-title'] . '" ' .
'popup-label="' . $options['popup-label'] . '" ' .
'popup-placeholder="' . $options['popup-placeholder'] . '">' .
Expand Down