From fa1826afdc911b0e25109ec7295f457d874eddf0 Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Wed, 22 Apr 2015 19:33:41 +0300 Subject: [PATCH] Kill OC_FileProxy references --- controller/sessioncontroller.php | 3 --- lib/genesis.php | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/controller/sessioncontroller.php b/controller/sessioncontroller.php index ba522a27..1a4103ff 100644 --- a/controller/sessioncontroller.php +++ b/controller/sessioncontroller.php @@ -256,10 +256,7 @@ class SessionController extends Controller{ $memberCount = count($memberIds) - 1; if ($view->file_exists($path)){ - $proxyStatus = \OC_FileProxy::$enabled; - \OC_FileProxy::$enabled = false; $currentHash = sha1($view->file_get_contents($path)); - \OC_FileProxy::$enabled = $proxyStatus; if (!Helper::isVersionsEnabled() && $currentHash !== $session->getGenesisHash()){ // Original file was modified externally. Save to a new one diff --git a/lib/genesis.php b/lib/genesis.php index f030f374..52e82e8f 100644 --- a/lib/genesis.php +++ b/lib/genesis.php @@ -58,12 +58,7 @@ class Genesis { $mimetype = $view->getMimeType($path); $data = Filter::read($content, $mimetype); - - $proxyStatus = \OC_FileProxy::$enabled; - \OC_FileProxy::$enabled = false; - $this->view->file_put_contents($this->path, $data['content']); - \OC_FileProxy::$enabled = $proxyStatus; } try { @@ -87,12 +82,7 @@ class Genesis { protected function getDocumentHash($view, $path){ $this->validate($view, $path); - $proxyStatus = \OC_FileProxy::$enabled; - \OC_FileProxy::$enabled = false; - $hash = sha1($view->file_get_contents($path)); - - \OC_FileProxy::$enabled = $proxyStatus; return $hash; }