diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-11-05 12:06:59 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-11-05 12:06:59 +0100 |
| commit | 1147dc977422e827a201fa081abd07721231d072 (patch) | |
| tree | 203d47297c49545a67bbdd98cbe137b255a5d6d8 /lib/vcategories.php | |
| parent | 88b91a7304f2de998f71a674f4f62e85f5b83e54 (diff) | |
| parent | 135680e50bf760d55a1bcaaaa02f959bde396c52 (diff) | |
| download | nextcloud-server-1147dc977422e827a201fa081abd07721231d072.tar.gz nextcloud-server-1147dc977422e827a201fa081abd07721231d072.zip | |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
Diffstat (limited to 'lib/vcategories.php')
| -rw-r--r-- | lib/vcategories.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/vcategories.php b/lib/vcategories.php index 7032afd5fde..bae9e3d0391 100644 --- a/lib/vcategories.php +++ b/lib/vcategories.php @@ -661,6 +661,7 @@ class OC_VCategories { if(!is_array($names)) { $names = array($names); } + OC_Log::write('core', __METHOD__ . ', before: ' . print_r($this->categories, true), OC_Log::DEBUG); foreach($names as $name) { @@ -724,6 +725,7 @@ class OC_VCategories { unset($categories[$this->array_searchi($name, $categories)]); } } + $object->setString('CATEGORIES', implode(',', $categories)); if($vobject !== $object) { $vobject[$componentname] = $object; |