Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix/masa 306 bugfix filebrowser #336

Open
wants to merge 2 commits into
base: release/7.4
Choose a base branch
from
Open

Bugfix/masa 306 bugfix filebrowser #336

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f6f901
Merge pull request #320 from MasaCMS/release/7.4
guustnieuwenhuis Jun 21, 2024
4511ab4
Fix for getting the rb for the filebrowser.
jeroenweareorangeeu Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix for getting the rb for the filebrowser.
  • Loading branch information
@jeroenweareorangeeu
jeroenweareorangeeu committed Sep 12, 2024
commit 4511ab40a38359488aba49f356eb2a1793d267e4
21 changes: 9 additions & 12 deletions core/mura/resourceBundle/resourceBundle.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,20 +218,17 @@ component extends="mura.cfobject" output="false" hint="This provides access to l
}

function getKeyStructure( key ) {
if( StructKeyExists(variables.resourceBundleStruct,"key") ) {
return variables.resourceBundleStruct[key];
}

var keyStruct = {};
if( StructKeyExists(variables.resourceBundleStruct,arguments.key) ) {
return variables.resourceBundleStruct[arguments.key];
} else {
variables.resourceBundleStruct[arguments.key] = {};

for(var i in variables.resourceBundle) {
if( left( i,len(arguments.key) ) eq key ) {
variables.resourceBundleStruct[key][replace(i,".","_","all")] = variables.resourceBundle[i];
for(var i in variables.resourceBundle) {
if( left( i,len(arguments.key) ) eq arguments.key ) {
variables.resourceBundleStruct[arguments.key][replace(i,".","_","all")] = variables.resourceBundle[i];
}
}
return variables.resourceBundleStruct[arguments.key];
}

return variables.resourceBundleStruct[key];

}

}