From 5bafd63ec16b0bece2cb4382fb4a6a8a4c403865 Mon Sep 17 00:00:00 2001
From: GenPage <genpage@technicpack.net>
Date: Sun, 1 Mar 2015 23:40:35 -0500
Subject: [PATCH] v0.7.1.1 - Bug Fixes - Replaced boolval with (bool) type
 casting, Fixes #322 and Resolves #329 - Fix undefined index when GitHub API
 client errors - Add rule to ignore laravel compiled classes - Remove composer
 pre-upgrade-script for removing laravel compiled classes

---
 .gitignore                            | 3 ++-
 app/controllers/BaseController.php    | 2 +-
 app/controllers/ModpackController.php | 2 +-
 app/controllers/SolderController.php  | 3 ++-
 app/views/solder/update.blade.php     | 2 +-
 composer.json                         | 3 ---
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 506d3922..eade9654 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ public/resources/*
 !public/resources/default
 public/vendor
 app/database/*.sqlite
-site/
\ No newline at end of file
+site/
+bootstrap/compiled.php
diff --git a/app/controllers/BaseController.php b/app/controllers/BaseController.php
index 5211a239..fabd74c9 100644
--- a/app/controllers/BaseController.php
+++ b/app/controllers/BaseController.php
@@ -8,7 +8,7 @@ public function __construct()
 			define('SOLDER_STREAM', 'DEV');
 		}
 		if(!defined('SOLDER_VERSION')) {
-			define('SOLDER_VERSION', 'v0.7.1.0');
+			define('SOLDER_VERSION', 'v0.7.1.1');
 		}
 
 		UpdateUtils::init();
diff --git a/app/controllers/ModpackController.php b/app/controllers/ModpackController.php
index 09c06086..5c1c7dd2 100644
--- a/app/controllers/ModpackController.php
+++ b/app/controllers/ModpackController.php
@@ -255,7 +255,7 @@ public function postEdit($modpack_id)
 
 		$useS3 = Config::get('solder.use_s3') ? true : false;
 		$S3bucket = Config::get('solder.bucket');
-		$newSlug = boolval($oldSlug != $modpack->slug);
+		$newSlug = (bool) $oldSlug != $modpack->slug;
 
 		if ($useS3) {
 			$resourcePath = storage_path() . '/resources/' . $modpack->slug;
diff --git a/app/controllers/SolderController.php b/app/controllers/SolderController.php
index b9d7fef3..7bbe350b 100644
--- a/app/controllers/SolderController.php
+++ b/app/controllers/SolderController.php
@@ -24,12 +24,13 @@ public function getUpdate()
 	{
 		$rawChangeLog = UpdateUtils::getLatestChangeLog();
 		$changelog = array_key_exists('error', $rawChangeLog) ? $rawChangeLog : array_slice($rawChangeLog, 0, 10);
+		$latestCommit = array_key_exists('error', $rawChangeLog) ? $rawChangeLog : $rawChangeLog[0];
 
 		$rawLatestVersion = UpdateUtils::getLatestVersion();
 		$latestVersion = array_key_exists('error', $rawLatestVersion) ? $rawLatestVersion : $rawLatestVersion['name'];
 
 		$latestData = array('version' => $latestVersion,
-							'commit' => $changelog[0]);
+							'commit' => $latestCommit);
 		
 		return View::make('solder.update')->with('changelog', $changelog)->with('currentVersion', SOLDER_VERSION)->with('latestData', $latestData);
 	}
diff --git a/app/views/solder/update.blade.php b/app/views/solder/update.blade.php
index fb5605ff..c27fa794 100644
--- a/app/views/solder/update.blade.php
+++ b/app/views/solder/update.blade.php
@@ -22,7 +22,7 @@
                 </label><br>
                 <label>Latest Commit: 
                 @if (array_key_exists('error', $changelog))
-                <span class="label label-danger">{{ $latestData['error'] }}</span>
+                <span class="label label-danger">{{ $latestData['commit']['error'] }}</span>
                 @else
 		        <span class="label label-default">{{ $latestData['commit']['sha'] }}</span>
                 @endif
diff --git a/composer.json b/composer.json
index 763f0bd3..52072f87 100644
--- a/composer.json
+++ b/composer.json
@@ -43,9 +43,6 @@
 		]
 	},
 	"scripts": {
-		"pre-update-cmd": [
-			"php -r \"@unlink('bootstrap/compiled.php');\""
-		],
 		"post-install-cmd": [
 			"php -r \"shell_exec((strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? 'mkdir app\\config && copy app\\config-sample app\\config' : 'cp -r app/config-sample app/config');\"",
 			"php -r \"copy('app/database-sample/production.sqlite', 'app/database/production.sqlite');\"",