Skip to content

Commit

Permalink
Merge branch 'hotfix/3.1.3.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
nilsteampassnet committed Dec 21, 2024
2 parents 114e7ff + 04667c3 commit b238415
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion includes/config/include.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

define('TP_VERSION', '3.1.3');
define("UPGRADE_MIN_DATE", "1732981987");
define('TP_VERSION_MINOR', '2');
define('TP_VERSION_MINOR', '5');
define('TP_TOOL_NAME', 'Teampass');
define('TP_ONE_DAY_SECONDS', 86400);
define('TP_ONE_WEEK_SECONDS', 604800);
Expand Down
4 changes: 2 additions & 2 deletions pages/items.js.php
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ function(teampassApplication) {
});

// Prepare some UI elements
$('#limited-search').prop('checked', '<?php echo $SETTINGS['limited_search_default']; ?>');
$('#limited-search').prop('checked', <?php echo (int) $SETTINGS['limited_search_default'] === 1 ? true : false; ?>);

$(document).on('blur', '#form-item-icon', function() {
$('#form-item-icon-show').html('<i class="fas '+$(this).val()+'"></i>');
Expand Down Expand Up @@ -3392,7 +3392,7 @@ function(teampassItem) {

// Warn in case of limited search
$(document).on('click', '#limited-search', function() {
if ($(this).is(":checked") != "<?php echo $SETTINGS['limited_search_default']; ?>") {
if ($(this).is(":checked") !== <?php echo (int) $SETTINGS['limited_search_default'] === 1 ? 'true' : 'false'; ?>) {
$('#find_items').addClass('bg-red');
} else {
$('#find_items').removeClass('bg-red');
Expand Down

0 comments on commit b238415

Please sign in to comment.