ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deploy optionhelp to option view

This commit is contained in:
Andrew Bauer 2020-09-11 13:23:14 -05:00
parent d2b2291721
commit 26cefda712
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/classic/includes/functions.php
View File

@ -762,7 +762,7 @@ function getOptionHelpHTML($optionHelpIndex, $OLANG) {
if ( !empty($OLANG[$optionHelpIndex]) ) { if ( !empty($OLANG[$optionHelpIndex]) ) {
$optionHelpText = $OLANG[$optionHelpIndex]['Help']; $optionHelpText = $OLANG[$optionHelpIndex]['Help'];
} else { } else {
$optionHelpText = dbFetchOne('SELECT Help FROM Config WHERE Name=?', 'Help', array($ZMoptionHelpIndex)); $optionHelpText = dbFetchOne('SELECT Help FROM Config WHERE Name=?', 'Help', array($optionHelpIndex));
} }
$optionHelpText = validHtmlStr($optionHelpText); $optionHelpText = validHtmlStr($optionHelpText);
$optionHelpText = preg_replace('/~~/', '<br/>', $optionHelpText ); $optionHelpText = preg_replace('/~~/', '<br/>', $optionHelpText );

2
web/skins/classic/views/options.php
View File

@ -512,7 +512,7 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
<?php <?php
} }
?> ?>
<span class="form-text form-control-sm"><?php echo validHtmlStr($optionPromptText) ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option='.$name, 'zmOptionHelp', 'optionhelp', '?' ) ?>)</span> <span class="form-text form-control-sm"><?php echo validHtmlStr($optionPromptText); echo makeHelpLink($name) ?></span>
</div><!-- End .col-sm-9 --> </div><!-- End .col-sm-9 -->
</div><!-- End .form-group --> </div><!-- End .form-group -->
<?php <?php