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

Do not create -conflict if versions are enabled

Browse Source
This commit is contained in:
Victor Dubiniuk 2013-11-21 23:38:39 +03:00
parent 3830de9dda
commit 99818f98ea
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ajax/sessionController.php
View File

@ -101,7 +101,7 @@ class SessionController extends Controller{
if ($view->file_exists($path)){
$currentHash = sha1($view->file_get_contents($path));
if ($currentHash !== $sessionData['genesis_hash']){
if (!Helper::isVersionsEnabled() && $currentHash !== $sessionData['genesis_hash']){
// Original file was modified externally. Save to a new one
$path = Helper::getNewFileName($view, $path, '-conflict');
}

4
lib/helper.php
View File

@ -26,6 +26,10 @@ class Helper{
return $path;
}
public static function isVersionsEnabled(){
return \OCP\App::isEnabled('files_versions');
}
public static function getRandomColor(){
$str = dechex(floor(rand(0, 16777215)));
return '#' . str_pad($str, 6, "0", STR_PAD_LEFT);