mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make loading of tags from DB more explicit.

This commit is contained in:
Bernhard Reiter 2014-10-10 23:18:43 +02:00
parent 226d7233e1
commit bc265e8b52
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/private/tags.php
View File

@ -121,14 +121,6 @@ class Tags implements \OCP\ITags {
$this->owners = array_merge($this->owners, \OC\Share\Share::getSharedItemsOwners($this->user, $this->type, true)); $this->owners = array_merge($this->owners, \OC\Share\Share::getSharedItemsOwners($this->user, $this->type, true));
$this->backend = \OC\Share\Share::getBackend($this->type); $this->backend = \OC\Share\Share::getBackend($this->type);
} }
$this->loadTags($defaultTags);
}
/**
* Load tags from db.
*
*/
protected function loadTags($defaultTags=array()) {
$this->tags = $this->mapper->loadTags($this->owners, $this->type); $this->tags = $this->mapper->loadTags($this->owners, $this->type);
if(count($defaultTags) > 0 && count($this->tags) === 0) { if(count($defaultTags) > 0 && count($this->tags) === 0) {
@ -413,7 +405,9 @@ class Tags implements \OCP\ITags {
} }
// reload tags to get the proper ids. // reload tags to get the proper ids.
$this->loadTags(); $this->tags = $this->mapper->loadTags($this->owners, $this->type);
\OCP\Util::writeLog('core', __METHOD__.', tags: ' . print_r($this->tags, true),
\OCP\Util::DEBUG);
// Loop through temporarily cached objectid/tagname pairs // Loop through temporarily cached objectid/tagname pairs
// and save relations. // and save relations.
$tags = $this->tags; $tags = $this->tags;