CRM-18515 - Allow Payment Processor with same name when using multi-domain #8316
Conversation
|
Can one of the admins verify this patch? |
|
@darrick can you please squash multiple commits in this PR into one commit. Here are the steps:
for reference http://stackoverflow.com/questions/9790448/how-to-update-a-pull-request |
|
Looks like you meant @darrick ... |
|
oops sorry :) |
Comment suggests 'c_' to identify a non-CRM connection + timestamp to the hour + connection_id but code used 'con_' I think the shorter version in comment is better as there is more real information space
This should resolve warnings on systems where MyISAM was default engine.
…ted by the cnrtl char
…e name the name is the key to use
There were problems in this line: * The missing comma (required by Drupal style) * The use of literal CtrlA causes phpcs to produce invalid output
… mysqlColumnNameLoose method.
…ing' un-ticked, but still persists ---------------------------------------- * CRM-18154: Profile custom field option: "Include in multi-record listing" un-ticked, but still persists https://issues.civicrm.org/jira/browse/CRM-18154
---------------------------------------- * CRM-18154: Profile custom field option: "Include in multi-record listing" un-ticked, but still persists https://issues.civicrm.org/jira/browse/CRM-18154
…uage object and language_list are different in Backdrop
In CRM_Mailing_Event_BAO_Delivered::updateEmailResetDate(), call for CRM_Core_DAO::executeQuery($query), so the temporary table can be filled.
|
@monishdeb believe I just made things worse. I tried git rebase --interactive after git checkout orgin/CRM-18515 but only choice was NOOP. I then tried git rebase -i origin/master but it didn't list all the commits. So I used git rebase -i HEAD~7 which gave me all the commits and dropped all the commits except for the main one. Then on git push it said I wasn't up to date. So I chose git pull and then git push. |
|
@darrick .. seems like rebase need to be done against upstream/master not origin/master since later is outdated branch that's why you got unwanted commits piled up on top of your earlier commits. (As i said above on the first step that 'git rebase --interactive' actually does rebasing against upstream/master if you don't mention it) For now its better to close the current pr and create a new branch in your local and make the changes manually as the patch is just a one file change. |
|
Cleaned up PR. #8344 |
|
Can one of the admins verify this patch? |
https://issues.civicrm.org/jira/browse/CRM-18515