[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [websites/paste-kde-org] app: Remediate installer
From:       Sayak Banerjee <sayakb () kde ! org>
Date:       2014-11-01 22:48:48
Message-ID: E1XkhTU-0000Ov-OF () scm ! kde ! org
[Download RAW message or body]

Git commit fbced1b19ea48535c4f2db67c73d3e5d69fcb3ea by Sayak Banerjee.
Committed on 01/11/2014 at 22:41.
Pushed by sayakb into branch 'master'.

Remediate installer

M  +1    -1    app/config/app.php
M  +4    -8    app/config/schema.php
D  +-    --    app/database/testing.sqlite

http://commits.kde.org/websites/paste-kde-org/fbced1b19ea48535c4f2db67c73d3e5d69fcb3ea

diff --git a/app/config/app.php b/app/config/app.php
index 3a2df8d..af47908 100755
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -12,7 +12,7 @@ return array(
 	|
 	*/
 
-	'version' => '1.8',
+	'version' => '1.9',
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/app/config/schema.php b/app/config/schema.php
index 5af41f8..c9aafaa 100755
--- a/app/config/schema.php
+++ b/app/config/schema.php
@@ -796,15 +796,11 @@ return array(
 
 				$config = Site::config('general');
 
-				$noExpire = 'all';
+				$noExpire = isset($config->noExpire) AND ! $config->noExpire ? 'none' : 'all';
 
-				// Modify config values
-				if (isset($config->noExpire) AND ! $config->noExpire)
-				{
-					Site::config('general', array(
-						'noExpire' => 'none',
-					));
-				}
+				Site::config('general', array(
+					'noExpire' => $noExpire,
+				));
 
 			},
 
diff --git a/app/database/testing.sqlite b/app/database/testing.sqlite
deleted file mode 100755
index 0287ca3..0000000
Binary files a/app/database/testing.sqlite and /dev/null differ

[prev in list] [next in list] [prev in thread] [next in thread]