Merge pull request #207 from mreishman/3.4.1

mreishman · web-flow · commit 7d23b57772a1 · 2019-01-09T14:58:10.000-06:00
3.4.1.1b
diff --git a/core/html/changelog.html b/core/html/changelog.html
@@ -8,6 +8,9 @@
 					<li>
 						Fixed setup bug
 					</li>
+					<li>
+						Fixed bug with cache status missing on initial load causing errors
+					</li>
 				</ul>
 			</li>
 		</ul>
diff --git a/core/js/settingsAll.js b/core/js/settingsAll.js
@@ -1,5 +1,8 @@
-function saveAndVerifyMain(idForForm)
+var modiferUrl = "";
+
+function saveAndVerifyMain(idForForm, modifier = "")
 {
+	modiferUrl = modifier;
 	idForFormMain = idForForm;
 	idForm = "#"+idForForm;
 	displayLoadingPopup();
@@ -28,7 +31,7 @@ function timerVerifySave()
 	countForVerifySave++;
 	if(countForVerifySave < 20)
 	{
-		var urlForSend = "core/php/saveFunctions/saveCheck.php?format=json";
+		var urlForSend = modiferUrl+"core/php/saveFunctions/saveCheck.php?format=json";
 		$.ajax(
 		{
 			url: urlForSend,
diff --git a/index.php b/index.php
@@ -24,6 +24,7 @@
 require_once($baseUrl.'conf/config.php');
 require_once('core/conf/config.php');
 require_once('core/php/configStatic.php');
+$cachedStatusMainObject = array();
 if(file_exists('core/conf/cachedStatus.php'))
 {
 	require_once('core/conf/cachedStatus.php');
diff --git a/setup/welcome.php b/setup/welcome.php
@@ -53,13 +53,13 @@ function clean_url($url) {
 	function defaultSettings()
 	{
 		//change setupProcess to finished
-		saveAndVerifyMain("defaultVarsForm");
+		saveAndVerifyMain("defaultVarsForm","../");
 	}
 
 	function customSettings()
 	{
 		//change setupProcess to page1
-		saveAndVerifyMain("defaultVarsForm");
+		saveAndVerifyMain("defaultVarsForm","../");
 	}
 </script>
 <script src="stepsJavascript.js"></script>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`		`-function saveAndVerifyMain(idForForm)`
	`1`	`+var modiferUrl = "";`
	`2`	`+`
	`3`	`+function saveAndVerifyMain(idForForm, modifier = "")`
`2`	`4`	`{`
	`5`	`+ modiferUrl = modifier;`
`3`	`6`	`idForFormMain = idForForm;`
`4`	`7`	`idForm = "#"+idForForm;`
`5`	`8`	`displayLoadingPopup();`
`@@ -28,7 +31,7 @@ function timerVerifySave()`
`28`	`31`	`countForVerifySave++;`
`29`	`32`	`if(countForVerifySave < 20)`
`30`	`33`	`{`
`31`		`- var urlForSend = "core/php/saveFunctions/saveCheck.php?format=json";`
	`34`	`+ var urlForSend = modiferUrl+"core/php/saveFunctions/saveCheck.php?format=json";`
`32`	`35`	`$.ajax(`
`33`	`36`	`{`
`34`	`37`	`url: urlForSend,`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`require_once($baseUrl.'conf/config.php');`
`25`	`25`	`require_once('core/conf/config.php');`
`26`	`26`	`require_once('core/php/configStatic.php');`
	`27`	`+$cachedStatusMainObject = array();`
`27`	`28`	`if(file_exists('core/conf/cachedStatus.php'))`
`28`	`29`	`{`
`29`	`30`	`require_once('core/conf/cachedStatus.php');`
Original file line number	Diff line number	Diff line change
`@@ -53,13 +53,13 @@ function clean_url($url) {`
`53`	`53`	`function defaultSettings()`
`54`	`54`	`{`
`55`	`55`	`//change setupProcess to finished`
`56`		`- saveAndVerifyMain("defaultVarsForm");`
	`56`	`+ saveAndVerifyMain("defaultVarsForm","../");`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`function customSettings()`
`60`	`60`	`{`
`61`	`61`	`//change setupProcess to page1`
`62`		`- saveAndVerifyMain("defaultVarsForm");`
	`62`	`+ saveAndVerifyMain("defaultVarsForm","../");`
`63`	`63`	`}`
`64`	`64`	`</script>`
`65`	`65`	`<script src="stepsJavascript.js"></script>`