Fix bug #109: preserve privacy setting from Delicious export files.
Thanks for David Glenck for the initial version of this patch.
This commit is contained in:
parent
d0ed9adec8
commit
0a040e2134
1 changed files with 8 additions and 1 deletions
|
@ -67,6 +67,8 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
|
|||
|
||||
$bDatetime = ""; //bDateTime optional
|
||||
$bCategories = ""; //bCategories optional
|
||||
$bPrivateNote = ""; //bPrivateNote optional
|
||||
$bPrivate = $status; //bPrivate set default
|
||||
|
||||
foreach ($attributes[0] as $attribute) {
|
||||
$att = preg_split('/\s*=\s*/s', $attribute, 2);
|
||||
|
@ -86,6 +88,11 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
|
|||
break;
|
||||
case "NOTE":
|
||||
$bPrivateNote = $attrVal;
|
||||
break;
|
||||
case "PRIVATE":
|
||||
if ($attrVal) {
|
||||
$bPrivate = 2;//private
|
||||
}
|
||||
}
|
||||
}
|
||||
$bTitle = trim($titles[$i]);
|
||||
|
@ -102,7 +109,7 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
|
|||
$bDatetime = gmdate('Y-m-d H:i:s');
|
||||
}
|
||||
|
||||
if ($bookmarkservice->addBookmark($bAddress, $bTitle, $bDescription, $bPrivateNote, $status, $bCategories, null, $bDatetime, false, true)) {
|
||||
if ($bookmarkservice->addBookmark($bAddress, $bTitle, $bDescription, $bPrivateNote, $bPrivate, $bCategories, null, $bDatetime, false, true)) {
|
||||
$countImportedBookmarks++;
|
||||
} else {
|
||||
$tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.');
|
||||
|
|
Loading…
Reference in a new issue