Skip to content
Permalink
Browse files
CB-6414 - fixes the config.xml issue with android and ios, correcting…
… the bug at the ConfigKeeper.get method
  • Loading branch information
Josh Bavari committed Apr 10, 2014
1 parent 70ff5bd commit 28e4052ed0613a626da84696076eff6f430d349c
Showing 1 changed file with 7 additions and 4 deletions.
@@ -274,10 +274,6 @@ function reapply_global_munge () {
);
continue;
}
if(file == 'config.xml') {
file = resolveConfigFilePath(self.project_dir, self.platform, file);
file = path.relative(self.project_dir, file);
}

self.apply_file_munge(file, global_munge.files[file]);
}
@@ -390,7 +386,14 @@ function ConfigKeeper() {
ConfigKeeper.prototype.get = ConfigKeeper_get;
function ConfigKeeper_get(project_dir, platform, file) {
var self = this;

//This fixes a bug with older plugins - when specifying config xml instead of res/xml/config.xml
//https://issues.apache.org/jira/browse/CB-6414
if(file == 'config.xml' && platform == 'android'){
file = 'res/xml/config.xml';
}
var fake_path = path.join(project_dir, platform, file);

if (self._cached[fake_path]) {
return self._cached[fake_path];
}

0 comments on commit 28e4052

Please sign in to comment.