diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-11-04 21:12:18 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-11-04 21:12:18 +0100 |
| commit | 4b940955ddb3266f625eae83da412a655efef319 (patch) | |
| tree | 8ed6bb2fae2f5fa3cb61c630e3dc98af5e99d656 /apps/files_versions | |
| parent | 8a6bb7965d96b1c4297da8f5dbc9644fec7aeb0f (diff) | |
| parent | 555dd5c261e52cf64f5a8eb6f4d03635cedafbbe (diff) | |
| download | nextcloud-server-4b940955ddb3266f625eae83da412a655efef319.tar.gz nextcloud-server-4b940955ddb3266f625eae83da412a655efef319.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files_versions')
| -rw-r--r-- | apps/files_versions/appinfo/app.php | 2 | ||||
| -rw-r--r-- | apps/files_versions/history.php | 2 | ||||
| -rw-r--r-- | apps/files_versions/lib/hooks.php | 2 | ||||
| -rw-r--r-- | apps/files_versions/settings-personal.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index 746f89a8139..599d302e6e4 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -5,7 +5,7 @@ OC::$CLASSPATH['OCA_Versions\Storage'] = 'apps/files_versions/lib/versions.php'; OC::$CLASSPATH['OCA_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php'; OCP\App::registerAdmin('files_versions', 'settings'); -OCP\App::registerPersonal('files_versions','settings-personal'); +OCP\App::registerPersonal('files_versions', 'settings-personal'); OCP\Util::addscript('files_versions', 'versions'); diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php index 0ebb34f45e4..deff735cedc 100644 --- a/apps/files_versions/history.php +++ b/apps/files_versions/history.php @@ -22,7 +22,7 @@ */ OCP\User::checkLoggedIn( ); -OCP\Util::addStyle('files_versions','versions'); +OCP\Util::addStyle('files_versions', 'versions'); $tmpl = new OCP\Template( 'files_versions', 'history', 'user' ); if ( isset( $_GET['path'] ) ) { diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php index bc3a7fda9f7..4c07ed9bb71 100644 --- a/apps/files_versions/lib/hooks.php +++ b/apps/files_versions/lib/hooks.php @@ -64,7 +64,7 @@ class Hooks { $abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$params['newpath'].'.v'; if(Storage::isversioned($rel_oldpath)) { $info=pathinfo($abs_newpath); - if(!file_exists($info['dirname'])) mkdir($info['dirname'],0750, true); + if(!file_exists($info['dirname'])) mkdir($info['dirname'], 0750, true); $versions = Storage::getVersions($rel_oldpath); foreach ($versions as $v) { rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']); diff --git a/apps/files_versions/settings-personal.php b/apps/files_versions/settings-personal.php index 4fb866bd999..6555bc99c3e 100644 --- a/apps/files_versions/settings-personal.php +++ b/apps/files_versions/settings-personal.php @@ -2,6 +2,6 @@ $tmpl = new OCP\Template( 'files_versions', 'settings-personal'); -OCP\Util::addscript('files_versions','settings-personal'); +OCP\Util::addscript('files_versions', 'settings-personal'); return $tmpl->fetchPage(); |