fix last http://tracker.moodle.org/browse/MDL-20917 shorten errors.

diff --git a/search/documents/physical_htm.php b/search/documents/physical_htm.php
index ef0a8a0e48a0f71a4a4a0e92c2f47584fdd28577..760851115808aeb5ef3d0e71b93cd943f5f87fb8 100644 (file)
--- a/search/documents/physical_htm.php
+++ b/search/documents/physical_htm.php
@@ -58,7 +58,7 @@ function get_text_for_indexing_htm(&$resource, $directfile = ''){
     */
     
     if (!empty($CFG->block_search_limit_index_body)){
-        $text = shorten($text, $CFG->block_search_limit_index_body);
+        $text = shorten_text($text, $CFG->block_search_limit_index_body);
     }
     return $text;
 }

diff --git a/search/documents/physical_ppt.php b/search/documents/physical_ppt.php
index 7dd14e6c8b4fcee6192fb1414308ac10566d84b1..f86bbf5b017171fab6a2fa767a17569819ee664b 100644 (file)
--- a/search/documents/physical_ppt.php
+++ b/search/documents/physical_ppt.php
@@ -87,7 +87,7 @@ function get_text_for_indexing_ppt(&$resource, $directfile = ''){
     // fclose($logppt);
     
     if (!empty($CFG->block_search_limit_index_body)){
-        $indextext = shorten($text, $CFG->block_search_limit_index_body);
+        $indextext = shorten_text($text, $CFG->block_search_limit_index_body);
     }
 
     $indextext = mb_convert_encoding($indextext, 'UTF-8', 'auto');

diff --git a/search/documents/physical_txt.php b/search/documents/physical_txt.php
index 1cdf8eb1b292c7a566173b991177a6b93b00b57d..6d69c838bce8b73f392e0113345dac51710053a2 100644 (file)
--- a/search/documents/physical_txt.php
+++ b/search/documents/physical_txt.php
@@ -33,7 +33,7 @@ function get_text_for_indexing_txt(&$resource, $directfile = ''){
     }
     
     if (!empty($CFG->block_search_limit_index_body)){
-        $text = shorten($text, $CFG->block_search_limit_index_body);
+        $text = shorten_text($text, $CFG->block_search_limit_index_body);
     }
     return $text;
 }

diff --git a/search/documents/physical_xml.php b/search/documents/physical_xml.php
index 58dbb4bc412a43b906325bcf0cde374175c91c11..6347ae01e86eaf2b5957fb0b5b53876d97aa6333 100644 (file)
--- a/search/documents/physical_xml.php
+++ b/search/documents/physical_xml.php
@@ -36,7 +36,7 @@ function get_text_for_indexing_xml(&$resource, $directfile = ''){
     $text = preg_replace("/<[^>]*>/", ' ', $text);
     
     if (!empty($CFG->block_search_limit_index_body)){
-        $text = shorten($text, $CFG->block_search_limit_index_body);
+        $text = shorten_text($text, $CFG->block_search_limit_index_body);
     }
     return $text;
 }