summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2010-08-31 00:21:51 -0400
committerCraig Andrews <candrews@integralblue.com>2010-09-03 17:50:29 -0400
commitc54ef9b8b646c244a679527ff886ba3abfc92c61 (patch)
tree19efbbe5530697e727f806d65d63c2c5ad48c3b5
parentd68914e4f3a5844c19396a94e3ae41895a36e9a2 (diff)
is_otr -> isOtr
-rw-r--r--lib/implugin.php4
-rw-r--r--plugins/Irc/IrcPlugin.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/implugin.php b/lib/implugin.php
index f08fef6cd..f4504f525 100644
--- a/lib/implugin.php
+++ b/lib/implugin.php
@@ -418,7 +418,7 @@ abstract class ImPlugin extends Plugin
* @param string $txt message text
* @return boolean true if OTR
*/
- protected function is_otr($txt)
+ protected function isOtr($txt)
{
if (preg_match('/^\?OTR/', $txt)) {
return true;
@@ -456,7 +456,7 @@ abstract class ImPlugin extends Plugin
} else if ($this->isAutoreply($notice_text)) {
common_log(LOG_INFO, 'Ignoring auto reply from ' . $from);
return;
- } else if ($this->is_otr($notice_text)) {
+ } else if ($this->isOtr($notice_text)) {
common_log(LOG_INFO, 'Ignoring OTR from ' . $from);
return;
} else {
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index dc077eeab..7a53e5cbf 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -247,7 +247,7 @@ class IrcPlugin extends ImPlugin {
} else if ($this->isAutoreply($notice_text)) {
common_log(LOG_INFO, 'Ignoring auto reply from ' . $nick);
return;
- } else if ($this->is_otr($notice_text)) {
+ } else if ($this->isOtr($notice_text)) {
common_log(LOG_INFO, 'Ignoring OTR from ' . $nick);
return;
} else {