Changes from branches/2.6/wp-includes/streams.php at r8421 to trunk/wp-includes/streams.php at r8117

File:

• trunk/wp-includes/streams.php (modified) (5 diffs)

trunk/wp-includes/streams.php

@@ -59 +59 @@
     $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 = $this->_substr($this->_str, $this->_pos, $bytes);
+    $data = substr($this->_str, $this->_pos, $bytes);
     $this->_pos += $bytes;
-    if ($this->_strlen($this->_str)<$this->_pos)
-      $this->_pos = $this->_strlen($this->_str);
+    if (strlen($this->_str)<$this->_pos)
+      $this->_pos = strlen($this->_str);
 
     return $data;
@@ -90 +72 @@
   function seekto($pos) {
     $this->_pos = $pos;
-    if ($this->_strlen($this->_str)<$this->_pos)
-      $this->_pos = $this->_strlen($this->_str);
+    if (strlen($this->_str)<$this->_pos)
+      $this->_pos = strlen($this->_str);
     return $this->_pos;
   }
@@ -100 +82 @@
 
   function length() {
-    return $this->_strlen($this->_str);
+    return strlen($this->_str);
   }
+
 }
 
@@ -167 +150 @@
 class CachedFileReader extends StringReader {
   function CachedFileReader($filename) {
-    parent::StringReader();
-
     if (file_exists($filename)) {
 
@@ -175 +156 @@
 
       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);
+      $this->_pos = 0;
       fclose($fd);