Changeset 430

Timestamp:

Oct 31, 2013 9:21:07 PM (11 years ago)

Author:

anonymous

Message:

 

File:

• branches/1.1dev/lib/SpellCheck.inc.php (modified) (4 diffs)

branches/1.1dev/lib/SpellCheck.inc.php

@@ -202 +202 @@
         // http://stackoverflow.com/questions/790596/split-a-text-into-single-words
         $words = preg_split("/((^\p{P}+)|(\p{P}*\s+\p{P}*)|[\p{Pd}—–-]+|(\p{P}+$))/", $string);
-        // Remove non-word elements.
-        $words = preg_grep('/\w+/', $words);
-
         if (is_array($words) && !empty($words)) {
+            // Remove non-word elements.
+            $words = preg_grep('/\w+/', $words);
+            $words = array_map('strip_tags', $words);
             foreach ($words as $i => $word) {
                 if (!$this->check($word)) {
@@ -238 +238 @@
         // http://stackoverflow.com/questions/790596/split-a-text-into-single-words
         $words = preg_split("/((^\p{P}+)|(\p{P}*\s+\p{P}*)|[\p{Pd}—–-]+|(\p{P}+$))/", $string);
-        // Remove non-word elements.
-        $check_words = preg_grep('/\w+/', $words);
-
-        if (is_array($check_words) && !empty($check_words)) {
-            foreach ($check_words as $i => $word) {
+        if (is_array($words) && !empty($words)) {
+            // Remove non-word elements.
+            $words = preg_grep('/\w+/', $words);
+            $words = array_map('strip_tags', $words);
+            foreach ($words as $i => $word) {
                 if (!$this->check($word)) {
                     $errors[] = $word;
@@ -271 +271 @@
         // http://stackoverflow.com/questions/790596/split-a-text-into-single-words
         $words = preg_split("/((^\p{P}+)|(\p{P}*\s+\p{P}*)|[\p{Pd}—–-]+|(\p{P}+$))/", $string);
-        $check_words = preg_grep('/\w+/', $words);
         $cnt = 0;
-        if (is_array($check_words) && !empty($check_words)) {
-            foreach ($check_words as $i => $word) {
+        if (is_array($words) && !empty($words)) {
+            $words = preg_grep('/\w+/', $words);
+            foreach ($words as $i => $word) {
                 if (!$this->check($word)) {
                     $footnote = $show_footnote ? '<sup style="color:#999;">' . ++$cnt . '</sup>' : '';
@@ -300 +300 @@
         <?php
         
-        $form_words = array_values($this->getStringSuggestions(getFormData($form_name)));
+        $form_words = $this->getStringSuggestions(getFormData($form_name));
         if (is_array($form_words) && !empty($form_words)) {
             ?><ol><?php
+            $j = 1;
             foreach ($form_words as $i => $words) {
                 ?>
                 <li>
-                <label style="color:#999;"><sub style="vertical-align:text-top;"><?php echo $i + 1; ?></sub></label>
+                <label style="color:#999;"><sub style="vertical-align:text-top;"><?php echo $j++; ?></sub></label>
                 <select name="spelling_suggestions[<?php echo $form_name ?>][<?php echo $i ?>]" onchange="document.forms[0].elements['spelling_corrections[<?php echo $form_name ?>][<?php echo $i ?>]'].value = this.value;">
                 <?php $original_word = array_shift($words); ?>