added preferences to base.php, will be needed for i18n stuff

remotes/origin/stable
Jakob Sack 14 years ago
parent 14dddc0c9e
commit 6a19a7d226
  1. 2
      lib/base.php
  2. 3
      log/index.php

@ -80,6 +80,8 @@ require_once('appconfig.php');
require_once('files.php'); require_once('files.php');
require_once('filesystem.php'); require_once('filesystem.php');
require_once('filestorage.php'); require_once('filestorage.php');
require_once('l10n.php');
require_once('preferences.php');
require_once('log.php'); require_once('log.php');
require_once('user.php'); require_once('user.php');
require_once('group.php'); require_once('group.php');

@ -24,8 +24,7 @@
//require_once('../../config/config.php'); //require_once('../../config/config.php');
require_once('../lib/base.php'); require_once('../lib/base.php');
require( 'template.php' ); require_once( 'template.php' );
require( 'preferences.php' );
if( !OC_USER::isLoggedIn()){ if( !OC_USER::isLoggedIn()){
header( 'Location: '.OC_HELPER::linkTo( 'index.php' )); header( 'Location: '.OC_HELPER::linkTo( 'index.php' ));

Loading…
Cancel
Save