Merge branch 'stage' into v1.0

FalconChristmas · Nov 11, 2014 · f4f25c2 · f4f25c2
2 parents 4af2ead + 23b7061
commit f4f25c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/www/common.php b/www/common.php
@@ -284,11 +284,7 @@ function save" . $setting . "() {
 }
 </script>
 
-<input type='button' class='buttons' id='save$setting' ";
-
-	IfSettingEqualPrint($setting, $checkedValue, "checked", $pluginName);
-
-	echo " onClick='save" . $setting . "();' value='Save'>\n";
+<input type='button' class='buttons' id='save$setting' onClick='save" . $setting . "();' value='Save'>\n";
 }
 
 ?>

diff --git a/www/pluginData.inc.php b/www/pluginData.inc.php
@@ -9,7 +9,7 @@
 		'homeUrl'     => 'https://github.com/Materdaddy/fpp-vastfmt',
 		'sourceUrl'   => 'https://github.com/Materdaddy/fpp-vastfmt.git',
 		'bugUrl'      => 'https://github.com/Materdaddy/fpp-vastfmt/issues',
-		'sha'         => '0441ac944210d3946e951d981089f494a6150090',
+		'sha'         => 'ade42fca1cdcd2e9d99fecd5efde84d0a5bbd086',
 	),
 
 	Array(
@@ -29,7 +29,7 @@
 		'homeUrl'     => 'https://github.com/FalconChristmas/big-green-button',
 		'sourceUrl'   => 'https://github.com/FalconChristmas/big-green-button.git',
 		'bugUrl'      => 'https://github.com/FalconChristmas/big-green-button/issues',
-		'sha'         => 'ba31143fd8cfbefe1125df93092c7831c40d6e6e',
+		'sha'         => '968484b8013f26582c2c93d14b3b1fe786d2e57e',
 	),
 
 	Array(