diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-30 19:57:57 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-07-30 19:57:57 -0400 |
| commit | 0d3ebbfefdc65a90c78fa49c28eccbd1e0dfb563 (patch) | |
| tree | 906d2783aca1cd439ae50869b9a240f9d5b68066 /lib | |
| parent | 11d162751381963e0c8a86cf15c811cc99003654 (diff) | |
| parent | 3a08f747fb714731ec1323fc59d3cb7c4784db5e (diff) | |
| download | nextcloud-server-0d3ebbfefdc65a90c78fa49c28eccbd1e0dfb563.tar.gz nextcloud-server-0d3ebbfefdc65a90c78fa49c28eccbd1e0dfb563.zip | |
Merge branch 'master' into sharing
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 13 | ||||
| -rw-r--r-- | lib/search/provider/file.php | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/lib/base.php b/lib/base.php index 324713de61c..bbd89e4fdb3 100644 --- a/lib/base.php +++ b/lib/base.php @@ -87,9 +87,16 @@ if( !OC_Config::getValue( "installed", false )){ $_SESSION['user_id'] = ''; } + OC_User::useBackend( OC_Config::getValue( "userbackend", "database" )); OC_Group::setBackend( OC_Config::getValue( "groupbackend", "database" )); +// Load Apps +// This includes plugins for users and filesystems as well +if(!$error and !$RUNTIME_NOAPPS ){ + OC_App::loadApps(); +} + // Was in required file ... put it here OC_Filesystem::registerStorageType('local','OC_Filestorage_Local',array('datadir'=>'string')); require_once('apps/files_sharing/sharedstorage.php'); @@ -107,10 +114,6 @@ OC_Util::addScript( "js" ); OC_Util::addStyle( "jquery-ui-1.8.14.custom" ); OC_Util::addStyle( "styles" ); -// Load Apps -if(!$error and !$RUNTIME_NOAPPS ){ - OC_App::loadApps(); -} // FROM Connect.php function OC_CONNECT_TEST($path,$user,$password){ @@ -200,4 +203,4 @@ if(!function_exists('sys_get_temp_dir')) { require_once('fakedirstream.php'); // FROM search.php -new OC_Search_Provider_File();
\ No newline at end of file +new OC_Search_Provider_File(); diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php index e257b82a694..f84d098dd69 100644 --- a/lib/search/provider/file.php +++ b/lib/search/provider/file.php @@ -6,9 +6,9 @@ class OC_Search_Provider_File extends OC_Search_Provider{ $results=array(); foreach($files as $file){ if(OC_Filesystem::is_dir($file)){ - $results[]=new OC_Search_Result(basename($file),$file,OC_Helper::linkTo( 'files', 'index.php?dir='.$file ),'Files'); + $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'index.php?dir='.$file ),'Files'); }else{ - $results[]=new OC_Search_Result(basename($file),$file,OC_Helper::linkTo( 'files', 'download.php?file='.$file ),'Files'); + $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php?file='.$file ),'Files'); } } return $results; |