rpicms

commit 006c296a49a5c2661d3887732a1fd0773542ab9f
parent 661688291b2463c733a3ca781b2027afcc184316
Author: MTRNord <mtrnord1@gmail.com>
Date:   Tue, 24 Feb 2015 17:05:46 +0100

superglobals are crazy

Diffstat:
M
core/update/update/update.php
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/update/update/update.php b/core/update/update/update.php
@@ -78,7 +78,7 @@ class AutoUpdate
 	 *
 	 * @var string
 	 */
-   private $_updateFile = "update.json.".'$_branch';
+   private $_updateFile = 'update.json.'
 
 	/**
 	 * Current version.
@@ -233,7 +233,7 @@ class AutoUpdate
 	 */
 	public function setUpdateFile($updateFile)
 	{
-		$this->_updateFile = $updateFile;
+		$this->_updateFile = $updateFile . $_branch;
 	}
 
 	/**
@@ -364,7 +364,7 @@ class AutoUpdate
 
 		// Check if cache is empty
 		if ($versions === false) {
-			$updateFile = $this->_updateUrl . '/' . $this->_updateFile;
+			$updateFile = $this->_updateUrl . '/' . $this->_updateFile . $_branch;
 			$this->_log->addDebug(sprintf('Get new updates from %s', $updateFile));
 
 			// Read update file from update server
@@ -375,7 +375,7 @@ class AutoUpdate
 			}
 
 			// Parse update file
-			$updateFileExtension = substr(strrchr($this->_updateFile, '.'), 1);
+			$updateFileExtension = substr(strrchr($this->_updateFile . $_branch, '.'), 1);
 			switch ($updateFileExtension) {
 				case 'ini':
 					$versions = parse_ini_string($update, true);