Permalink
Browse files

Merge remote-tracking branch 'origin/master'

2 parents 84c24bf + fa04e02 commit b18cb98131bd83103ccb26a888fdfe3177b8a663 @Synchro Synchro committed Jan 9, 2017
Showing with 2 additions and 2 deletions.
  1. +1 −1 examples/scripts/XRegExp.js
  2. +1 −1 extras/htmlfilter.php
@@ -259,7 +259,7 @@ if (XRegExp) {
//---------------------------------
- // Overriden native methods
+ // Overridden native methods
//---------------------------------
// Adds named capture support (with backreferences returned as `result.name`), and fixes two
@@ -433,7 +433,7 @@ function tln_getnxtag($body, $offset)
*
* @param string $attvalue the by-ref value to check.
* @param string $regex the regular expression to check against.
- * @param boolean $hex whether the entites are hexadecimal.
+ * @param boolean $hex whether the entities are hexadecimal.
* @return boolean True or False depending on whether there were matches.
*/
function tln_deent(&$attvalue, $regex, $hex = false)

0 comments on commit b18cb98

Please sign in to comment.