Merge branch 'develop'

3 files changed, 10 insertions, 6 deletions

diff --git a/src/client/app/common/scripts/aiscript.ts b/src/client/app/common/scripts/aiscript.ts
index 4ef21f9943..a3e499fc88 100644
--- a/src/client/app/common/scripts/aiscript.ts
+++ b/src/client/app/common/scripts/aiscript.ts
@@ -316,8 +316,10 @@ export class AiScript {
 
 	@autobind
 	private interpolate(str: string, values: { name: string, value: any }[]) {
-		return str.replace(/\{(.+?)\}/g, match =>
-			(this.getVariableValue(match.slice(1, -1).trim(), values) || '').toString());
+		return str.replace(/\{(.+?)\}/g, match => {
+			const v = this.getVariableValue(match.slice(1, -1).trim(), values);
+			return v == null ? 'NULL' : v.toString();
+		});
 	}
 
 	@autobind
@@ -445,7 +447,7 @@ export class AiScript {
 		}
 
 		if (AiScript.envVarsDef[name]) {
-			return this.envVars[name].value;
+			return this.envVars[name];
 		}
 
 		throw new Error(`Script: No such variable '${name}'`);
diff --git a/src/client/app/common/views/pages/page/page.vue b/src/client/app/common/views/pages/page/page.vue
index 5ca58a6a4e..e7e8f76d53 100644
--- a/src/client/app/common/views/pages/page/page.vue
+++ b/src/client/app/common/views/pages/page/page.vue
@@ -38,8 +38,10 @@ class Script {
 	}
 
 	public interpolate(str: string) {
-		return str.replace(/\{(.+?)\}/g, match =>
-			(this.vars.find(x => x.name === match.slice(1, -1).trim()).value || '').toString());
+		return str.replace(/\{(.+?)\}/g, match => {
+			const v = this.vars.find(x => x.name === match.slice(1, -1).trim()).value;
+			return v == null ? 'NULL' : v.toString();
+		});
 	}
 }
 
diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue
index 05692667b7..9b87e0c29f 100644
--- a/src/client/app/desktop/views/components/ui.header.account.vue
+++ b/src/client/app/desktop/views/components/ui.header.account.vue
@@ -35,7 +35,7 @@
 						<i><fa icon="angle-right"/></i>
 					</p>
 				</li>
-				<li @click="page">
+				<li>
 					<router-link to="/i/pages">
 						<i><fa :icon="faStickyNote" fixed-width/></i>
 						<span>{{ $t('@.pages') }}</span>