Merge branch 'master' of github.com:shish/shimmie2

This commit is contained in:
Shish
2012-02-10 01:29:49 +00:00
6 changed files with 29 additions and 25 deletions

View File

@ -57,12 +57,12 @@ class NotesTheme extends Themelet {
$parsedNote = str_replace("\r", "\\r", $parsedNote);
$to_json[] = array(
'x1': $note["x1"],
'y1': $note["y1"],
'height': $note["height"],
'width': $note["width"],
'note': $parsedNote,
'note_id': $note["id"],
'x1' => $note["x1"],
'y1' => $note["y1"],
'height' => $note["height"],
'width' => $note["width"],
'note' => $parsedNote,
'note_id' => $note["id"],
);
}