Skip to content

Commit

Permalink
Merge pull request #14159 from civicrm/5.13
Browse files Browse the repository at this point in the history
5.13 to master
  • Loading branch information
eileenmcnaughton authored Apr 30, 2019
2 parents 64ee429 + dab9c39 commit 1d322b8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion CRM/Case/Form/Activity/OpenCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ public static function buildQuickForm(&$form) {
'type' => 'upload',
'name' => ts('Save and New'),
'subName' => 'new',
'submitOnce' => TRUE,
],
[
'type' => 'cancel',
Expand Down
2 changes: 1 addition & 1 deletion bin/cli.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ private function _parseOptions() {
// of this script
array_shift($args);

while (list($k, $arg) = each($args)) {
foreach ($args as $k => $arg) {
// sanitize all user input
$arg = $this->_sanitize($arg);

Expand Down

0 comments on commit 1d322b8

Please sign in to comment.