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 @@