From a829ce69c5da821795f35f21566595c61249a5c4 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 28 Feb 2012 17:24:59 +0100 Subject: [PATCH] make sure the streamwrappers are registered early --- lib/base.php | 9 +++++---- lib/streamwrappers.php | 3 --- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/base.php b/lib/base.php index 7783b4c638..d1422d7fc5 100644 --- a/lib/base.php +++ b/lib/base.php @@ -293,6 +293,11 @@ class OC{ if( !OC_Config::getValue( "installed", false )){ $_SESSION['user_id'] = ''; } + + // register the stream wrappers + require_once('streamwrappers.php'); + stream_wrapper_register("fakedir", "OC_FakeDirStream"); + stream_wrapper_register('static', 'OC_StaticStreamWrapper'); OC_User::useBackend( OC_Config::getValue( "userbackend", "database" )); OC_Group::setBackend( OC_Config::getValue( "groupbackend", "database" )); @@ -346,9 +351,5 @@ if(!function_exists('get_temp_dir')) { OC::init(); -require_once('streamwrappers.php'); - - - // FROM search.php new OC_Search_Provider_File(); diff --git a/lib/streamwrappers.php b/lib/streamwrappers.php index 1454a99e8d..05d5598819 100644 --- a/lib/streamwrappers.php +++ b/lib/streamwrappers.php @@ -218,6 +218,3 @@ class OC_StaticStreamWrapper { return false; } } - -stream_wrapper_register("fakedir", "OC_FakeDirStream"); -stream_wrapper_register('static', 'OC_StaticStreamWrapper');