Wordpress 2.8-scripts

[autoinstalls/wordpress.git] / wp-includes / streams.php

diff --git a/wp-includes/streams.php b/wp-includes/streams.php
index 595acd775b80df8dbacf757bb9eedccb0ea56b67..60b617de8fb601a9305db22aaa5e3538f3720903 100644 (file)
--- a/wp-includes/streams.php
+++ b/wp-includes/streams.php
@@ -58,21 +58,39 @@ class StringReader {
   function StringReader($str='') {
     $this->_str = $str;
     $this->_pos = 0;
+    // If string functions are overloaded, we need to use the mb versions
+    $this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr');
+  }
+
+  function _substr($string, $start, $length) {
+       if ($this->is_overloaded) {
+               return mb_substr($string,$start,$length,'ascii');
+       } else {
+               return substr($string,$start,$length);
+       }
+  }
+
+  function _strlen($string) {
+       if ($this->is_overloaded) {
+               return mb_strlen($string,'ascii');
+       } else {
+               return strlen($string);
+       }
   }
 
   function read($bytes) {
-    $data = substr($this->_str, $this->_pos, $bytes);
+         $data = $this->_substr($this->_str, $this->_pos, $bytes);
     $this->_pos += $bytes;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
+    if ($this->_strlen($this->_str)<$this->_pos)
+      $this->_pos = $this->_strlen($this->_str);
 
     return $data;
   }
 
   function seekto($pos) {
     $this->_pos = $pos;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
+    if ($this->_strlen($this->_str)<$this->_pos)
+      $this->_pos = $this->_strlen($this->_str);
     return $this->_pos;
   }
 
@@ -81,9 +99,8 @@ class StringReader {
   }
 
   function length() {
-    return strlen($this->_str);
+    return $this->_strlen($this->_str);
   }
-
 }
 
 
@@ -149,17 +166,19 @@ class FileReader {
 // over it (it assumes knowledge of StringReader internals)
 class CachedFileReader extends StringReader {
   function CachedFileReader($filename) {
+    parent::StringReader();
+
     if (file_exists($filename)) {
 
       $length=filesize($filename);
       $fd = fopen($filename,'rb');
 
       if (!$fd) {
-       $this->error = 3; // Cannot read file, probably permissions
-       return false;
+        $this->error = 3; // Cannot read file, probably permissions
+        return false;
       }
       $this->_str = fread($fd, $length);
-      fclose($fd);
+         fclose($fd);
 
     } else {
       $this->error = 2; // File doesn't exist
@@ -169,4 +188,4 @@ class CachedFileReader extends StringReader {
 }
 
 
-?>
\ No newline at end of file
+?>