diff --git a/include/ajax.tickets.php b/include/ajax.tickets.php index 016ffcab2493b6e07067147e9368c1d9863f67fe..c92789dbb1425b105e93cc368afb90edbcf8e540 100644 --- a/include/ajax.tickets.php +++ b/include/ajax.tickets.php @@ -1516,7 +1516,7 @@ function refer($tid, $target=null) { $note = array( 'title' => __('Task Created From Thread Entry'), - 'note' => sprintf(__('This Task was created from Ticket %1$s', $ticketLink)) + 'note' => sprintf(__('This Task was created from Ticket %1$s'), $ticketLink), ); $task->postNote($note, $errors, $thisstaff); diff --git a/include/class.forms.php b/include/class.forms.php index 099c971f5fe5d4d3020c14e19d7b62d4f96b7cc1..4ceee8a551ef792927dee7af022ae5dc5ecb1966 100644 --- a/include/class.forms.php +++ b/include/class.forms.php @@ -2043,11 +2043,11 @@ class DatetimeField extends FormField { 'yd' => __('Yesterday'), 'tw' => __('This Week'), 'tm' => __('This Month'), - 'tq' => __('This Quater'), + 'tq' => __('This Quarter'), 'ty' => __('This Year'), 'lw' => __('Last Week'), 'lm' => __('Last Month'), - 'lq' => __('Last Quater'), + 'lq' => __('Last Quarter'), 'ly' => __('Last Year'), ); return $period ? $periods[$period] : $periods; diff --git a/include/class.misc.php b/include/class.misc.php index 65b1c357a677707a480e4819eb21f4796c465713..3a1dc0551508986b23ed0a9abbc822df8c39c0fe 100644 --- a/include/class.misc.php +++ b/include/class.misc.php @@ -174,7 +174,7 @@ class Misc { $end = $dt->modify('last day of this month'); break; case 'tq': - case 'this-quater': + case 'this-quarter': $offset = ($dt->format('m') - 1) % 3; $start = $dt->modify(" - $offset month") ->modify('first day of this month'); @@ -197,7 +197,7 @@ class Misc { $end = $start->modify('last day of this month'); break; case 'lq': - case 'last-quater': + case 'last-quarter': $offset = (($dt->format('m') - 1) % 3)+3; $start = $dt->modify(" - $offset month") ->modify('first day of this month'); diff --git a/include/staff/templates/dynamic-form.tmpl.php b/include/staff/templates/dynamic-form.tmpl.php index 00abf34cbb93d08e8d73c1e36ed6beed2e3ef61a..4cf5162dfcd0adab28d308bea7aee22b46ffa5e0 100644 --- a/include/staff/templates/dynamic-form.tmpl.php +++ b/include/staff/templates/dynamic-form.tmpl.php @@ -78,7 +78,8 @@ if (isset($options['entry']) && $options['mode'] == 'edit') { ?> success: $.proxy(function() { $(this).closest('tr').fadeOut(); }, this) - });" + }); + return false;" data-field-id="<?php echo $field->getAnswer()->get('field_id'); ?>" data-entry-id="<?php echo $field->getAnswer()->get('entry_id'); ?>"> <i class="icon-trash"></i> </a></div><?php diff --git a/include/staff/templates/queue-quickfilter.tmpl.php b/include/staff/templates/queue-quickfilter.tmpl.php index d7919963d54237f9e12186e217b0905c379cccc4..6046f7ae21af25a8c491a2abd774c4612eba1c10 100644 --- a/include/staff/templates/queue-quickfilter.tmpl.php +++ b/include/staff/templates/queue-quickfilter.tmpl.php @@ -35,7 +35,8 @@ var query = addSearchParam({'<?php echo $param; ?>': $(event.target).data('value $.pjax({ url: '?' + query, timeout: 2000, - container: '#pjax-container'});"> + container: '#pjax-container'}); +return false;"> <ul <?php if (count($choices) > 20) echo 'style="height:500px;overflow-x:hidden;overflow-y:scroll;"'; ?>> <?php foreach ($choices as $k=>$desc) { $selected = isset($quick_filter) && $quick_filter == $k; diff --git a/include/staff/templates/tasks-queue-sort.tmpl.php b/include/staff/templates/tasks-queue-sort.tmpl.php index c0156fddd8b17148c67657d193a4f2a02080e521..19fa4ccd25c6edb95b9b21f07876a7b095dc6ba8 100644 --- a/include/staff/templates/tasks-queue-sort.tmpl.php +++ b/include/staff/templates/tasks-queue-sort.tmpl.php @@ -9,7 +9,8 @@ var query = addSearchParam({'sort': $(event.target).data('mode'), 'dir': $(event $.pjax({ url: '?' + query, timeout: 2000, - container: '#pjax-container'});"> + container: '#pjax-container'}); +return false;"> <ul class="bleed-left"> <?php foreach ($queue_sort_options as $mode) { $desc = $sort_options[$mode]; diff --git a/include/staff/ticket-open.inc.php b/include/staff/ticket-open.inc.php index 267d927651833ba064e7bf38b1978b100433c752..a1f23e116d6b6db750b57865b7479ea694c14da6 100644 --- a/include/staff/ticket-open.inc.php +++ b/include/staff/ticket-open.inc.php @@ -130,6 +130,7 @@ if ($_POST) var newUser = new Option(user.email + ' - ' + user.name, user.id, true, true); return $("#user-name").append(newUser).trigger('change'); }); + return false; "><i class="icon-plus"></i> <?php echo __('Add New'); ?></a> <span class="error">*</span> @@ -158,6 +159,7 @@ if ($_POST) var newUser = new Option(user.name, user.id, true, true); return $("#cc_users_open").append(newUser).trigger('change'); }); + return false; "><i class="icon-plus"></i> <?php echo __('Add New'); ?></a> <br/><span class="error"><?php echo $errors['ccs']; ?></span> diff --git a/setup/test/tests/stubs.php b/setup/test/tests/stubs.php index 4c96e7104ddef6b216762a3db4b95025095082f8..c6bad69b1785f9c33b68768ab7da80a8a21d050b 100644 --- a/setup/test/tests/stubs.php +++ b/setup/test/tests/stubs.php @@ -98,6 +98,10 @@ class DateTimeZone { static function listIdentifiers() {} } +class DateTimeImmutable { + function createFromMutable() {} +} + class Phar { static function isValidPharFilename() {} function setStub() {}