adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-10 02:43:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.7.x'

Browse Source
This commit is contained in:
Alexey Sokolov
2018-05-28 21:22:29 +01:00
parent 0f137953fa 0cbe9d783d
commit e0a53310d1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/data/webadmin/tmpl/add_edit_user.tmpl
+2 -2
View File
@@ -331,8 +331,8 @@
<? SETBLOCK Substitutions_Link ?><a href="https://wiki.znc.in/ExpandString" target="_blank" class="external"><? FORMAT "Substitutions" ?></a><? ENDSETBLOCK ?>
<div class="subsection half" id="ctcpreplies_plain">
<div class="inputlabel"><label for="ctcpreplies"><? FORMAT "CTCP Replies:" ?></label></div>
<div><textarea id="ctcpreplies" name="ctcpreplies" cols="70" rows="3" id="ctcpreplies_text"><? LOOP CTCPLoop ?><? VAR CTCP ?>
<div class="inputlabel"><label for="ctcpreplies_text"><? FORMAT "CTCP Replies:" ?></label></div>
<div><textarea name="ctcpreplies" cols="70" rows="3" id="ctcpreplies_text"><? LOOP CTCPLoop ?><? VAR CTCP ?>
<? ENDLOOP ?>
</textarea></div>
<br /><span class="info"><? FORMAT "One reply per line. Example: <code>TIME Buy a watch!</code>" ?></span>
src/Modules.cpp
+1 -1
View File
@@ -1656,7 +1656,7 @@ bool CModules::LoadModule(const CString& sModule, const CString& sArgs,
if (!Info.SupportsType(eType)) {
dlclose(p);
sRetMsg = t_f("Module {1} does not support module type {1}.")(
sRetMsg = t_f("Module {1} does not support module type {2}.")(
sModule, CModInfo::ModuleTypeToString(eType));
return false;
}