Merge branch '8.x-1.x' into 7.x-1.x

cburschka · Feb 19, 2012 · 40f9bcf · 40f9bcf
2 parents 3fcd22d + 9a1ca48
commit 40f9bcf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/xbbcode.filter.inc b/xbbcode.filter.inc
@@ -168,7 +168,9 @@ class XBBCodeTagMatch {
       $this->start   = $regex_set[0][1];
       $this->end     = $regex_set[0][1] + strlen($regex_set[0][0]);
     }
-
+    else {
+      $this->offset = 0;
+    }
     $this->content = '';
   }
 

diff --git a/xbbcode.inc b/xbbcode.inc
@@ -35,7 +35,7 @@ function _xbbcode_build_filter($filter, $format) {
  *   - the 'info' key contains the data returned by each module's hook.
  */
 function _xbbcode_build_handlers() {
-  $module_names = xbbcode_module_names();
+  $module_names = _xbbcode_module_names();
   $handlers = array();
 
   foreach ($module_names as $module => $name) {