git.cweiske.de
/
grauphel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
01aae57
)
Fix bug #8: Titled blank notes cause SQL error
author
Christian Weiske
<christian.weiske@netresearch.de>
Thu, 2 Oct 2014 06:58:34 +0000
(08:58 +0200)
committer
Christian Weiske
<cweiske@cweiske.de>
Fri, 3 Oct 2014 16:49:13 +0000
(18:49 +0200)
lib/notestorage.php
patch
|
blob
|
history
diff --git
a/lib/notestorage.php
b/lib/notestorage.php
index 74494176d7856626198291bf314776c3c419fef3..c6659034e8da7d337bca551b43cf32cf126dcac6 100644
(file)
--- a/
lib/notestorage.php
+++ b/
lib/notestorage.php
@@
-225,7
+225,7
@@
class NoteStorage
'tags' => array(),
);
}
'tags' => array(),
);
}
-
+
return $this->noteFromRow($row);
}
return $this->noteFromRow($row);
}
@@
-398,15
+398,15
@@
class NoteStorage
{
return array(
'note_guid' => $note->guid,
{
return array(
'note_guid' => $note->guid,
- 'note_title' => $note->title,
+ 'note_title' =>
(string)
$note->title,
- 'note_content' => $note->{'note-content'},
- 'note_content_version' => $note->{'note-content-version'},
+ 'note_content' =>
(string)
$note->{'note-content'},
+ 'note_content_version' =>
(string)
$note->{'note-content-version'},
'note_create_date' => $note->{'create-date'},
'note_last_change_date' => $note->{'last-change-date'},
'note_last_metadata_change_date' => $note->{'last-metadata-change-date'},
'note_create_date' => $note->{'create-date'},
'note_last_change_date' => $note->{'last-change-date'},
'note_last_metadata_change_date' => $note->{'last-metadata-change-date'},
-
+
'note_open_on_startup' => (int) $note->{'open-on-startup'},
'note_pinned' => (int) $note->pinned,
'note_tags' => json_encode($note->tags),
'note_open_on_startup' => (int) $note->{'open-on-startup'},
'note_pinned' => (int) $note->pinned,
'note_tags' => json_encode($note->tags),