Skip to content

Commit

Permalink
Option with _ instead of -, misplaced docbook tags
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.php.net/repository/pear/packages/Text_Wiki/trunk@193037 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information
bertrand Gugger committed Aug 11, 2005
1 parent 3baf115 commit 515784c
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Text/Wiki/Parse/Default/Smiley.php
Expand Up @@ -41,7 +41,7 @@ class Text_Wiki_Parse_Smiley extends Text_Wiki_Parse {
* or, in order to define a variante
* 'variante' => 'symbol' as e.g. '(:' => ':)' equates left handed smile
*
* 'auto-nose' => boolean enabling the auto nose feature:
* 'auto_nose' => boolean enabling the auto nose feature:
* auto build a variante for 2 chars symbols by inserting a '-' as ':)' <=> ':-)'
*
* @access public
Expand Down Expand Up @@ -79,7 +79,7 @@ class Text_Wiki_Parse_Smiley extends Text_Wiki_Parse {
'(;' => ';)',
'|:' => ':|'
),
'auto-nose' => true
'auto_nose' => true
);

var $smileys = array();
Expand All @@ -88,9 +88,9 @@ class Text_Wiki_Parse_Smiley extends Text_Wiki_Parse {
* Constructor.
* We override the constructor to build up the regex from config
*
* @access public
* @param object &$obj the base conversion handler
* @return The parser object
* @access public
*/
function Text_Wiki_Parse_Smiley(&$obj)
{
Expand All @@ -99,7 +99,7 @@ function Text_Wiki_Parse_Smiley(&$obj)

// read the list of smileys to sort out variantes and :xxx: while building the regexp
$this->smileys = $this->getConf('smileys', $default['smileys']);
$autoNose = $this->getConf('auto-nose', $default['auto-nose']);
$autoNose = $this->getConf('auto_nose', $default['auto_nose']);
$reg1 = $reg2 = '';
$sep1 = ':(?:';
$sep2 = '';
Expand Down Expand Up @@ -141,9 +141,9 @@ function Text_Wiki_Parse_Smiley(&$obj)
* 'src' => the URL / path to the smiley
* 'attr' => empty for basic BBCode
*
* @access public
* @param array &$matches The array of matches from parse().
* @return string Delimited token representing the smiley
* @access public
*/
function process(&$matches)
{
Expand Down

0 comments on commit 515784c

Please sign in to comment.