Merge branch 'w32_MDL-40438_m26_textlib' of https://github.com/skodak/moodle

Conflicts:
	lib/weblib.php

diff --cc lib/weblib.php
index 8455be0,ca1dc5a..319d83e
--- 1/lib/weblib.php
--- 2/lib/weblib.php
+++ b/lib/weblib.php
@@@ -858,13 -838,13 +858,13 @@@ function data_submitted() 
   */
  function break_up_long_words($string, $maxsize=20, $cutchar=' ') {
  
 -/// First of all, save all the tags inside the text to skip them
 +    // First of all, save all the tags inside the text to skip them.
      $tags = array();
 -    filter_save_tags($string,$tags);
 +    filter_save_tags($string, $tags);
  
 -/// Process the string adding the cut when necessary
 +    // Process the string adding the cut when necessary.
      $output = '';
-     $length = textlib::strlen($string);
+     $length = core_text::strlen($string);
      $wordlength = 0;
  
      for ($i=0; $i<$length; $i++) {
@@@ -1435,9 -1419,9 +1435,9 @@@ function format_text_email($text, $form
              break;
  
          case FORMAT_WIKI:
 -            // there should not be any of these any more!
 +            // There should not be any of these any more!
              $text = wikify_links($text);
-             return textlib::entities_to_utf8(strip_tags($text), true);
+             return core_text::entities_to_utf8(strip_tags($text), true);
              break;
  
          case FORMAT_HTML:
@@@ -2641,24 -2629,25 +2641,24 @@@ function obfuscate_email($email) 
   * @return string The obfuscated text
   */
  function obfuscate_text($plaintext) {
-     $i = 0;
-     $length = textlib::strlen($plaintext);
-     $obfuscated = '';
 -
+     $i=0;
+     $length = core_text::strlen($plaintext);
+     $obfuscated='';
 -    $prev_obfuscated = false;
 +    $prevobfuscated = false;
      while ($i < $length) {
-         $char = textlib::substr($plaintext, $i, 1);
-         $ord = textlib::utf8ord($char);
+         $char = core_text::substr($plaintext, $i, 1);
+         $ord = core_text::utf8ord($char);
          $numerical = ($ord >= ord('0')) && ($ord <= ord('9'));
 -        if ($prev_obfuscated and $numerical ) {
 +        if ($prevobfuscated and $numerical ) {
              $obfuscated.='&#'.$ord.';';
 -        } else if (rand(0,2)) {
 +        } else if (rand(0, 2)) {
              $obfuscated.='&#'.$ord.';';
 -            $prev_obfuscated = true;
 +            $prevobfuscated = true;
          } else {
              $obfuscated.=$char;
 -            $prev_obfuscated = false;
 +            $prevobfuscated = false;
          }
 -      $i++;
 +        $i++;
      }
      return $obfuscated;
  }