DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Kill OC_FileProxy references

Browse Source
This commit is contained in:
Victor Dubiniuk 2015-04-22 19:33:41 +03:00
parent dd376e0dfa
commit fa1826afdc
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
controller/sessioncontroller.php
View File

@ -256,10 +256,7 @@ class SessionController extends Controller{
$memberCount = count($memberIds) - 1; $memberCount = count($memberIds) - 1;
if ($view->file_exists($path)){ if ($view->file_exists($path)){
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
$currentHash = sha1($view->file_get_contents($path)); $currentHash = sha1($view->file_get_contents($path));
\OC_FileProxy::$enabled = $proxyStatus;
if (!Helper::isVersionsEnabled() && $currentHash !== $session->getGenesisHash()){ if (!Helper::isVersionsEnabled() && $currentHash !== $session->getGenesisHash()){
// Original file was modified externally. Save to a new one // Original file was modified externally. Save to a new one

10
lib/genesis.php
View File

@ -58,12 +58,7 @@ class Genesis {
$mimetype = $view->getMimeType($path); $mimetype = $view->getMimeType($path);
$data = Filter::read($content, $mimetype); $data = Filter::read($content, $mimetype);
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
$this->view->file_put_contents($this->path, $data['content']); $this->view->file_put_contents($this->path, $data['content']);
\OC_FileProxy::$enabled = $proxyStatus;
} }
try { try {
@ -87,12 +82,7 @@ class Genesis {
protected function getDocumentHash($view, $path){ protected function getDocumentHash($view, $path){
$this->validate($view, $path); $this->validate($view, $path);
$proxyStatus = \OC_FileProxy::$enabled;
\OC_FileProxy::$enabled = false;
$hash = sha1($view->file_get_contents($path)); $hash = sha1($view->file_get_contents($path));
\OC_FileProxy::$enabled = $proxyStatus;
return $hash; return $hash;
} }