badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge green-ponies/master

Browse source
This commit is contained in:
Shish 2012-01-16 21:19:10 +00:00
commit 9a4ea2bc77
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
contrib/notes/theme.php
View file

@ -56,7 +56,12 @@ class NotesTheme extends Themelet {
} }
// check action POST on form // check action POST on form
public function display_note_system(Page $page, $image_id, $recovered_notes, $adminOptions) { public function display_note_system(Page $page, $image_id, $recovered_notes, $adminOptions)
{
$data_href = get_base_href();
$page->add_html_header("<script src='$data_href/contrib/notes/jquery.qimgareaselect-0.4.js' type='text/javascript'></script>", 100);
$page->add_html_header("<script src='$data_href/contrib/notes/jquery.rimgnotes-0.2.js' type='text/javascript'></script>", 101);
$html = "<script type='text/javascript'> $html = "<script type='text/javascript'>
notes = ["; notes = [";

1
contrib/tag_history/main.php
View file

@ -163,6 +163,7 @@ class Tag_History implements Extension {
// there is no history entry with that id so either the image was deleted // there is no history entry with that id so either the image was deleted
// while the user was viewing the history, someone is playing with form // while the user was viewing the history, someone is playing with form
// variables or we have messed up in code somewhere. // variables or we have messed up in code somewhere.
/* calling die() is probably not a good idea, we should throw an Exception */
die("Error: No tag history with specified id was found."); die("Error: No tag history with specified id was found.");
} }