rpicms

commit aedb79cde034a982d216b9b25c8b33d584b4b2ff
parent 647f97c5fe34a27ae0db76b3c1f40dace6245c59
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sun, 21 Dec 2014 16:24:15 +0100

fix url and cleanup code

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

2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/core/update/update/update.php b/core/update/update/update.php
@@ -214,7 +214,6 @@ class AutoUpdate {
 	 */
 	public function downloadUpdate($updateUrl, $updateFile) {
 		$this->log('Downloading update...');
-		echo "$updateUrl";
 		$update = @file_get_contents($updateUrl);
 		
 		if ($update === false) {
@@ -346,7 +345,7 @@ class AutoUpdate {
 			}
 			
 			$updateFile = $this->tempDir.'/'.$this->latestVersion.'.zip';
-			$updateUrl = $this->updateUrl.'/'.$this->branch.$this->latestVersion.'.zip';
+			$updateUrl = $this->updateUrl.'/'.$this->branch.'/'.$this->latestVersion.'.zip';
 			
 			//Download update
 			if (!is_file($updateFile)) {
diff --git a/themes/jumbotron/update.php b/themes/jumbotron/update.php
@@ -34,7 +34,6 @@ $update->updateUrl = 'http://media.nordgedanken.de/rpicms/server'; //Replace wit
 //Check for a new update
 $latest = $update->checkUpdate();
 if ($latest !== false) {
-	echo $update->branch;
 	if ($latest > $update->currentVersion) {
 		//Install new update
 		echo "New Version: ".$update->latestVersionName."<br>";