summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-04-17 13:41:34 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-04-17 13:41:34 -0700
commitbd41896f4ae4d5a052244cd2f6b40060da01bd43 (patch)
tree43fce9b4af52aab6ea88965c504fe00e0b879211 /lib
parente8382b1292192d4c393f13ad7cd8da1be19211a8 (diff)
parent81714c6c31569e35f6b068791870bdfec25d005c (diff)
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'lib')
-rw-r--r--lib/searchaction.php2
-rw-r--r--lib/util.php3
2 files changed, 3 insertions, 2 deletions
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
+}
+