1
0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-12-22 21:40:08 +00:00

Merge branch 'master' into chatTemplate

This commit is contained in:
Tim Düsterhus 2011-12-09 23:43:20 +01:00
commit 17051c72d6
2 changed files with 21 additions and 2 deletions

View File

@ -56,8 +56,8 @@ public static function clearCache() {
/** /**
* @see \wcf\data\chat\room\ChatRoom::getTitle(); * @see \wcf\data\chat\room\ChatRoom::getTitle();
*/ */
public function __tostring() { public function __toString() {
return $this->getTitle; return $this->getTitle();
} }
/** /**

19
option.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/options.xsd">
<import>
<categories>
<category name="chat"></category>
<category name="chat.general">
<parent>chat</parent>
</category>
</categories>
<options>
<option name="chat_active">
<categoryname>chat.general</categoryname>
<optiontype>boolean</optiontype>
<defaultvalue><![CDATA[1]]></defaultvalue>
</option>
</options>
</import>
</data>