diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-04-17 13:41:34 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-04-17 13:41:34 -0700 |
| commit | bd41896f4ae4d5a052244cd2f6b40060da01bd43 (patch) | |
| tree | 43fce9b4af52aab6ea88965c504fe00e0b879211 | |
| parent | e8382b1292192d4c393f13ad7cd8da1be19211a8 (diff) | |
| parent | 81714c6c31569e35f6b068791870bdfec25d005c (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
| -rw-r--r-- | js/util.js | 2 | ||||
| -rw-r--r-- | lib/searchaction.php | 2 | ||||
| -rw-r--r-- | lib/util.php | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/js/util.js b/js/util.js index 38d2a9a42..53e6eb792 100644 --- a/js/util.js +++ b/js/util.js @@ -179,13 +179,13 @@ $(document).ready(function(){ } else { $("#notices_primary .notices").prepend(document._importNode($("li", xml).get(0), true)); - counter(); $("#notices_primary .notice:first").css({display:"none"}); $("#notices_primary .notice:first").fadeIn(2500); NoticeHover(); NoticeReply(); } $("#notice_data-text").val(""); + counter(); } $("#form_notice").removeClass("processing"); $("#notice_action-submit").removeAttr("disabled"); diff --git a/lib/searchaction.php b/lib/searchaction.php index e74450e11..e7ad4affd 100644 --- a/lib/searchaction.php +++ b/lib/searchaction.php @@ -51,7 +51,7 @@ class SearchAction extends Action * * @return boolean true */ - function isReadOnly($args) + function isReadOnly() { return true; } diff --git a/lib/util.php b/lib/util.php index 675ff51f0..5d16e39b5 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1333,4 +1333,5 @@ function common_database_tablename($tablename) } //table prefixes could be added here later return $tablename; -}
\ No newline at end of file +} + |