Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/unaio/una
Browse files Browse the repository at this point in the history
  • Loading branch information
romanlesnikov committed Mar 23, 2021
2 parents 3f63c59 + 3da8340 commit 49198ca
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
13 changes: 12 additions & 1 deletion inc/js/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,17 @@ function bx_conn_action(e, sObj, sAction, iContentId, bConfirm, fOnComplete) {
function bx_append_url_params (sUrl, mixedParams) {
var sParams = sUrl.indexOf('?') == -1 ? '?' : '&';

var sHash = '';
if(sUrl.indexOf('#') != -1) {
var oUrl = new URL(sUrl);
if(oUrl.hash.length > 0) {
sHash = oUrl.hash;
sUrl = sUrl.replace(sHash, '');
}
else
sUrl = sUrl.replace('#', '');
}

if(mixedParams instanceof Array) {
for(var i in mixedParams)
sParams += i + '=' + mixedParams[i] + '&';
Expand All @@ -915,7 +926,7 @@ function bx_append_url_params (sUrl, mixedParams) {
else
sParams += mixedParams;

return sUrl + sParams;
return sUrl + sParams + sHash;
}

function bx_search_on_type (e, n, sFormSel, sResultsContSel, sLoadingContSel, bSortResults, iMinLen) {
Expand Down
1 change: 0 additions & 1 deletion modules/boonex/donations/install/langs/en.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

<!-- Settings -->
<string name="_bx_donations_option_show_title"><![CDATA[Show donation title in addition to amount]]></string>
<string name="_bx_donations_option_recurring_reserve"><![CDATA[Reserve (in days) to accept and process recurring payment notification]]></string>

<!-- Forms -->
<string name="_bx_donations_form_type"><![CDATA[Type]]></string>
Expand Down
3 changes: 1 addition & 2 deletions modules/boonex/donations/install/sql/enable.sql
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ VALUES (@iTypeId, @sName, '_bx_donations', 10);
SET @iCategId = LAST_INSERT_ID();

INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
('bx_donations_show_title', '', @iCategId, '_bx_donations_option_show_title', 'checkbox', '', '', '', 1),
('bx_donations_recurring_reserve', '2', @iCategId, '_bx_donations_option_recurring_reserve', 'digit', '', '', '', 10);
('bx_donations_show_title', '', @iCategId, '_bx_donations_option_show_title', 'checkbox', '', '', '', 1);


-- PAGE: make
Expand Down

0 comments on commit 49198ca

Please sign in to comment.