From c80f32c614e48e237bcc3b72b780badf17d99dca Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 8 Oct 2011 17:56:27 -0400
Subject: Fixes #3936 added @access private to internal functions

---
 engine/lib/filestore.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engine/lib/filestore.php')

diff --git a/engine/lib/filestore.php b/engine/lib/filestore.php
index 1e257c8b0..70b8bfb4c 100644
--- a/engine/lib/filestore.php
+++ b/engine/lib/filestore.php
@@ -465,6 +465,7 @@ function set_default_filestore(ElggFilestore $filestore) {
  * ElggFile.
  *
  * @return void
+ * @access private
  */
 function filestore_run_once() {
 	// Register a class
@@ -476,6 +477,7 @@ function filestore_run_once() {
  * Listens to system boot and registers any appropriate file types and classes
  *
  * @return void
+ * @access private
  */
 function filestore_init() {
 	global $CONFIG;
@@ -496,6 +498,7 @@ function filestore_init() {
  * @param mixed  $params Params
  *
  * @return array
+ * @access private
  */
 function filestore_test($hook, $type, $value, $params) {
 	global $CONFIG;
-- 
cgit v1.2.3


From a6089b1d67498888a7cffafcdc6599fa37e5bcf3 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Wed, 19 Oct 2011 07:46:57 -0400
Subject: fixed minor errors in the documentation in plugins and filestore lib

---
 engine/lib/filestore.php | 2 +-
 engine/lib/plugins.php   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engine/lib/filestore.php')

diff --git a/engine/lib/filestore.php b/engine/lib/filestore.php
index 70b8bfb4c..a7aa1ff8c 100644
--- a/engine/lib/filestore.php
+++ b/engine/lib/filestore.php
@@ -474,7 +474,7 @@ function filestore_run_once() {
 
 /**
  * Initialise the file modules.
- * Listens to system boot and registers any appropriate file types and classes
+ * Listens to system init and configures the default filestore
  *
  * @return void
  * @access private
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index a9e8b21bc..8e50ed178 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -1080,8 +1080,8 @@ function plugins_test($hook, $type, $value, $params) {
 }
 
 /**
- * Initialise the file modules.
- * Listens to system boot and registers any appropriate file types and classes
+ * Initialize the plugin system
+ * Listens to system init and registers actions
  *
  * @return void
  * @access private
-- 
cgit v1.2.3


From 7ef727bfa242015d3ca7ab22671ec020006f0b4e Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Fri, 21 Oct 2011 21:03:37 -0400
Subject: don't set default filestore if we don't have a dataroot

---
 engine/lib/filestore.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'engine/lib/filestore.php')

diff --git a/engine/lib/filestore.php b/engine/lib/filestore.php
index a7aa1ff8c..a13d8aa27 100644
--- a/engine/lib/filestore.php
+++ b/engine/lib/filestore.php
@@ -483,8 +483,10 @@ function filestore_init() {
 	global $CONFIG;
 
 	// Now register a default filestore
-	set_default_filestore(new ElggDiskFilestore($CONFIG->dataroot));
-
+	if (isset($CONFIG->dataroot)) {
+		set_default_filestore(new ElggDiskFilestore($CONFIG->dataroot));
+	}
+	
 	// Now run this stuff, but only once
 	run_function_once("filestore_run_once");
 }
-- 
cgit v1.2.3