Skip to content
Snippets Groups Projects
Commit 33bc7739 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Merge remote-tracking branch 'origin/master'

parents 816ea9ed d8542bfc
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #413 passed
...@@ -618,7 +618,7 @@ if(echolist_fname && file_size(echolist_fname) > 0) { ...@@ -618,7 +618,7 @@ if(echolist_fname && file_size(echolist_fname) > 0) {
} }
if(network.areatitle_prefix) { if(network.areatitle_prefix) {
print("Removing " + network.areatitle_prefix + " Title Prefixes from " + echolist_fname); print("Removing " + network.areatitle_prefix + " Title Prefixes from " + echolist_fname);
var result = remove_prefix_from_titles(echolist_fname, network.areatitle_prefix); var result = remove_prefix_from_title(echolist_fname, network.areatitle_prefix);
if(result !== true) if(result !== true)
alert(result); alert(result);
} }
......
...@@ -70,7 +70,7 @@ function getCtrlLine(file) { ...@@ -70,7 +70,7 @@ function getCtrlLine(file) {
f.close(); f.close();
break; break;
default: default:
ctrl = file_getname(file); ctrl = pageName(file_getname(file));
break; break;
} }
...@@ -153,7 +153,7 @@ function _getPageList(dir) { ...@@ -153,7 +153,7 @@ function _getPageList(dir) {
} }
function pageName(p) { function pageName(p) {
return p.replace(/^\d*-/, ''); return p.replace(/^\d*-/, '').replace(/\..*$/, '');
} }
function mergePageLists(stock, mods) { function mergePageLists(stock, mods) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment