Fix PHP Warnings. Replace fatal with statusBounce. Mark appendBreadCr… #10888
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CRM/Financial/Form/Export.php
Outdated
| @@ -97,7 +97,9 @@ public function preProcess() { | |||
|
|
|||
| foreach ($batchStatus as $batchStatusId) { | |||
| if ($batchStatusId == $this->_exportStatusId) { | |||
| CRM_Core_Error::fatal(ts('You cannot exported the batches which were exported earlier.')); | |||
| //CRM_Core_Session::singleton()->user | |||
There was a problem hiding this comment.
@mattwire any reason for leaving this commented out line here
…umbs parameter as array instead of string so editors don't give a warning
mattwire
force-pushed
the
CRM-21092_financial_batch_fixes
branch
from
04e7228 to
0efdabe
Compare
| @@ -97,7 +97,8 @@ public function preProcess() { | |||
|
|
|||
| foreach ($batchStatus as $batchStatusId) { | |||
| if ($batchStatusId == $this->_exportStatusId) { | |||
| CRM_Core_Error::fatal(ts('You cannot exported the batches which were exported earlier.')); | |||
| $url = CRM_Core_Session::singleton()->readUserContext(); | |||
There was a problem hiding this comment.
I don't think you need this $url bit here - check the start of the statusBounce fn
public static function statusBounce($status, $redirect = NULL, $title = NULL) {
$session = CRM_Core_Session::singleton();
if (!$redirect) {
$redirect = $session->readUserContext();
}
There was a problem hiding this comment.
That's what I thought... but it doesn't work properly without as the user context is not set otherwise in this case.
eileenmcnaughton
added
the
merge ready
|
I think this is a good improvement. I have added merge-ready flag rather than merged it to give you a chance to respond to my comment. However, I don't think merging this is conditional on you making any further changes |
|
@eileenmcnaughton Thanks for reviewing. See response to comment :-) |
|
ok - I won't try to understand why then! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…umbs parameter as array instead of string so editors don't give a warning
Overview
Fix some PHP Warnings - NFC.
Replace fatal with statusBounce (as the form doesn't redirect when exporting a second click on the export link causes a fatal error). With this change it redirects and shows a helpful error message.
Mark CRM_Utils_System appendBreadCrumbs parameter as array instead of string so editors don't give a warning.