Reverted temporary changes to core lib files

remotes/origin/stable5
Sam Tuke 12 years ago
parent 1fc5b1d02d
commit 31cbb5a09f
  1. 6
      lib/base.php
  2. 4
      lib/filestorage/local.php

@ -351,9 +351,9 @@ class OC{
self::initPaths();
// register_shutdown_function(array('OC_Log', 'onShutdown'));
// set_error_handler(array('OC_Log', 'onError'));
// set_exception_handler(array('OC_Log', 'onException'));
register_shutdown_function(array('OC_Log', 'onShutdown'));
set_error_handler(array('OC_Log', 'onError'));
set_exception_handler(array('OC_Log', 'onException'));
// set debug mode if an xdebug session is active
if (!defined('DEBUG') || !DEBUG) {

@ -75,7 +75,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
return $result;
}
public function file_get_contents($path) {//trigger_error("path (get contents) = ".var_export($path, 1));
public function file_get_contents($path) {
return file_get_contents($this->datadir.$path);
}
public function file_put_contents($path,$data) {
@ -108,7 +108,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
}
return copy($this->datadir.$path1,$this->datadir.$path2);
}
public function fopen($path,$mode) {//trigger_error("path (fopen) = ".var_export($path, 1));
public function fopen($path,$mode) {
if($return=fopen($this->datadir.$path,$mode)) {
switch($mode) {
case 'r':

Loading…
Cancel
Save