diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2013-02-07 04:38:22 -0800 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2013-02-07 04:38:22 -0800 |
| commit | 8e70763cec3087283e2235f1861e0e6a1a80e231 (patch) | |
| tree | a89df2dc649bb7bddd1051000d34a12fe1f73dcf | |
| parent | 35bd7a400d30fb27703d4fa02b107f9629845b7d (diff) | |
| parent | ce293b8efc665ae0281787ed36979d1c8608290b (diff) | |
| download | nextcloud-server-8e70763cec3087283e2235f1861e0e6a1a80e231.tar.gz nextcloud-server-8e70763cec3087283e2235f1861e0e6a1a80e231.zip | |
Merge pull request #1522 from schiesbn/trash_bin_fix
OCA_Versions is now known as OCA\Files_Versions
| -rw-r--r-- | apps/files_trashbin/ajax/delete.php | 3 | ||||
| -rw-r--r-- | apps/files_trashbin/ajax/undelete.php | 2 | ||||
| -rw-r--r-- | apps/files_trashbin/appinfo/app.php | 6 | ||||
| -rw-r--r-- | apps/files_trashbin/lib/hooks.php | 2 | ||||
| -rw-r--r-- | apps/files_trashbin/lib/trash.php | 4 |
5 files changed, 8 insertions, 9 deletions
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index a166ce55c88..7ea0155724f 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -15,8 +15,7 @@ if ($path_parts['dirname'] == '.') { $timestamp = null; } -if (OCA_Trash\Trashbin::delete($filename, $timestamp)) { - error_log("feinifeini"); +if (OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp)) { OCP\JSON::success(array("data" => array("filename" => $file))); } else { OCP\JSON::error(array("data" => array("message" => "Couldn't delete ".$file. " permanently"))); diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php index ee1c64aaaf2..a118d003de7 100644 --- a/apps/files_trashbin/ajax/undelete.php +++ b/apps/files_trashbin/ajax/undelete.php @@ -22,7 +22,7 @@ foreach ($list as $file) { $timestamp = null; } - if ( !OCA_Trash\Trashbin::restore($file, $filename, $timestamp) ) { + if ( !OCA\Files_Trashbin\Trashbin::restore($file, $filename, $timestamp) ) { $error[] = $filename; } else { $success[$i]['filename'] = $file; diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php index 3741d42c781..b1a15cd13d1 100644 --- a/apps/files_trashbin/appinfo/app.php +++ b/apps/files_trashbin/appinfo/app.php @@ -1,7 +1,7 @@ <?php -OC::$CLASSPATH['OCA_Trash\Hooks'] = 'apps/files_trashbin/lib/hooks.php';
-OC::$CLASSPATH['OCA_Trash\Trashbin'] = 'apps/files_trashbin/lib/trash.php';
+OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'apps/files_trashbin/lib/hooks.php';
+OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'apps/files_trashbin/lib/trash.php';
-OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA_Trash\Hooks", "remove_hook"); +OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Trashbin\Hooks", "remove_hook"); diff --git a/apps/files_trashbin/lib/hooks.php b/apps/files_trashbin/lib/hooks.php index d3bee105b51..d6a62d447b8 100644 --- a/apps/files_trashbin/lib/hooks.php +++ b/apps/files_trashbin/lib/hooks.php @@ -24,7 +24,7 @@ * This class contains all hooks. */ -namespace OCA_Trash; +namespace OCA\Files_Trashbin; class Hooks { diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index e41dcb096c9..bc6562b2080 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -20,7 +20,7 @@ *
*/
-namespace OCA_Trash;
+namespace OCA\Files_Trashbin;
class Trashbin { @@ -65,7 +65,7 @@ class Trashbin { if ( \OCP\App::isEnabled('files_versions') ) {
if ( $view->is_dir('files_versions'.$file_path) ) {
$view->rename('files_versions'.$file_path, 'versions_trashbin/'. $deleted.'.d'.$timestamp);
- } else if ( $versions = \OCA_Versions\Storage::getVersions($file_path) ) {
+ } else if ( $versions = \OCA\Files_Versions\Storage::getVersions($file_path) ) {
foreach ($versions as $v) {
$view->rename('files_versions'.$v['path'].'.v'.$v['version'], 'versions_trashbin/'. $deleted.'.v'.$v['version'].'.d'.$timestamp);
}
|