rpicms

commit 1a2b11811a6b0ec04e530d73d6806b731b62b61b
parent b10d91674bed5f43aa6ec9409a63fbee510d3005
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sun, 21 Dec 2014 15:33:16 +0100

add support for branches

Diffstat:
M
core/update/update/update.php
 | 
3
+--
M
themes/jumbotron/update.php
 | 
1
+

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/update/update/update.php b/core/update/update/update.php
@@ -188,8 +188,6 @@ class AutoUpdate {
 							$latest = $version['version'];
 							$update = $version['url'];
 						}
-					}else {
-						echo "missing branch";
 					}
 				}
 				
@@ -215,6 +213,7 @@ class AutoUpdate {
 	 */
 	public function downloadUpdate($updateUrl, $updateFile) {
 		$this->log('Downloading update...');
+		$updateUrl = $updateUrl . $branch;
 		$update = @file_get_contents($updateUrl);
 		
 		if ($update === false) {
diff --git a/themes/jumbotron/update.php b/themes/jumbotron/update.php
@@ -28,6 +28,7 @@ require($root . '/core/update/update/update.php');
 
 $update = new AutoUpdate(true);
 $update->currentVersion = 1; //Must be an integer - you can't compare strings
+$update->branch = 'stable';
 $update->updateUrl = 'http://media.nordgedanken.de/rpicms/server'; //Replace with your server update directory
 
 //Check for a new update