From 9f57bfb5dfdb9ce843bb6d1665a1cd9c70ce5374 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 12 May 2016 16:13:29 -0700 Subject: update std_version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index b76e95c4f..2d118735a 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '1.6' ); +define ( 'STD_VERSION', '1.6.1' ); define ( 'ZOT_REVISION', 1 ); define ( 'DB_UPDATE_VERSION', 1168 ); -- cgit v1.2.3 From 2d79e75788aa71664a379c4cea0b6bfe3ab87ad0 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 12 May 2016 16:51:20 -0700 Subject: SECURITY: edited comment to private post loses privacy info. Not visible in stream but may be visible in feeds --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 2d118735a..c253df395 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '1.6.1' ); +define ( 'STD_VERSION', '1.6.2' ); define ( 'ZOT_REVISION', 1 ); define ( 'DB_UPDATE_VERSION', 1168 ); -- cgit v1.2.3 From b14dd0e066f7582bae6e558c40b5d25d83a33ae4 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 14 May 2016 21:05:24 -0700 Subject: issue #383 --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index c253df395..6b49e795c 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '1.6.2' ); +define ( 'STD_VERSION', '1.6.3' ); define ( 'ZOT_REVISION', 1 ); define ( 'DB_UPDATE_VERSION', 1168 ); -- cgit v1.2.3 From c3090d5480ef000531a8beb820ba97cc50ac21d7 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 15 May 2016 13:20:17 -0700 Subject: issue #387 --- boot.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 6b49e795c..27bf921ce 100755 --- a/boot.php +++ b/boot.php @@ -1656,7 +1656,8 @@ function goaway($s) { function shutdown() { global $db; - $db->close(); + if($db) + $db->close(); } /** -- cgit v1.2.3 From c9ce5664d4b9a9fe7bcde9ef5f123e58a8955e86 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 15 May 2016 13:22:22 -0700 Subject: roll minor version due to change --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 27bf921ce..c27fd1632 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '1.6.3' ); +define ( 'STD_VERSION', '1.6.4' ); define ( 'ZOT_REVISION', 1 ); define ( 'DB_UPDATE_VERSION', 1168 ); -- cgit v1.2.3 From a0dd03ea0e69fa68f7ba856e2e3ee63a5c1abf49 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 15 May 2016 17:56:13 -0700 Subject: be specific --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index c27fd1632..49295ce82 100755 --- a/boot.php +++ b/boot.php @@ -1656,7 +1656,7 @@ function goaway($s) { function shutdown() { global $db; - if($db) + if(is_object($db) && $db->connected) $db->close(); } -- cgit v1.2.3 From 296957b5b5de15f51ff6c6dc14c3e47b9b181359 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 16 May 2016 19:39:08 -0700 Subject: minor version roll --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 49295ce82..2c50021c8 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '1.6.4' ); +define ( 'STD_VERSION', '1.6.5' ); define ( 'ZOT_REVISION', 1 ); define ( 'DB_UPDATE_VERSION', 1168 ); -- cgit v1.2.3 From a4474b49cb805ca2039909a4d941268a02d5306a Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 3 Jun 2016 20:22:20 -0700 Subject: make init static on master also --- boot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 2c50021c8..625bc39fa 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '1.6.5' ); +define ( 'STD_VERSION', '1.6.6' ); define ( 'ZOT_REVISION', 1 ); define ( 'DB_UPDATE_VERSION', 1168 ); @@ -786,7 +786,7 @@ class App { /** * App constructor. */ - function init() { + public static function init() { // we'll reset this after we read our config file date_default_timezone_set('UTC'); -- cgit v1.2.3 From 953ca2c21ea9c1cc3390d153964a8979b466ed6d Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 19 Jun 2016 19:15:26 -0700 Subject: zot_revision should be string, not float --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 94f1c5342..a297bb732 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'STD_VERSION', '1.8' ); -define ( 'ZOT_REVISION', 1.1 ); +define ( 'ZOT_REVISION', '1.1' ); define ( 'DB_UPDATE_VERSION', 1176 ); -- cgit v1.2.3 From 3cf6f1f79ccbe88eaa1dd2be8d91aef91d7cc926 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 19 Jun 2016 21:47:04 -0700 Subject: merge conflict --- boot.php | 6 ------ 1 file changed, 6 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index a297bb732..a767a18d4 100755 --- a/boot.php +++ b/boot.php @@ -1744,13 +1744,7 @@ function goaway($s) { } function shutdown() { -<<<<<<< HEAD - global $db; - if(is_object($db) && $db->connected) - $db->close(); -======= ->>>>>>> 1.8RC } /** -- cgit v1.2.3