getChanConf checks _default too

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@1146 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/ChangeLog b/ChangeLog
index 97869ca926adb09e7702557faa5592f9089f1083..ac10b879605d7f14f5227ab89f0c970f3c430d28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-
+       * src/core.pl: getChanConf checks _default too
        * src/: "s/hasParam/IsChanConfOrWarn/"
        * src/: add handling for channel specific factoids:
          "#botpark logs" -> http://ibot.rikers.org/botpark

diff --git a/src/core.pl b/src/core.pl
index 9cdbb255c51c3bf0d5536ba0b3d501f9d8fcd632..20a85c3e27656e7599d6750e3cc8d7601bd77b66 100644 (file)
--- a/src/core.pl
+++ b/src/core.pl
@@ -326,10 +326,14 @@ sub getChanConf {
        if (0 and $c[0] ne $c) {
            &WARN("c ne chan ($c[0] ne $chan)");
        }
+       if (!defined $chanconf{$c[0]}{$param} and ($c ne '_default')) {
+           return &getChanConf($param, '_default');
+       }
+       #&DEBUG("gCC: $param,$c \"" . $chanconf{$c[0]}{$param} . '"');
        return $chanconf{$c[0]}{$param};
     }
 
-#    &DEBUG("gCC: returning _default... ");
+    #&DEBUG("gCC: returning _default... " . $chanconf{"_default"}{$param});
     return $chanconf{"_default"}{$param};
 }