Merge branch 'download-bug' into dev

Author: cvonkleist

packages/digitallibrary/lib/file.inc.php

@@ -747,7 +747,7 @@ public function fread($Bytes)
       static $preps = array();
       if(!isset($preps[$this->fpointer]))
       {
-         $query = "SELECT SUBSTRING({$_ARCHON->mdb2->quoteIdentifier($this->fpointer)}, ?, ?) as FilePacket FROM tblDigitalLibrary_Files WHERE ID = ?";
+         $query = "SELECT HEX(SUBSTRING({$_ARCHON->mdb2->quoteIdentifier($this->fpointer)}, ?, ?)) as FilePacket FROM tblDigitalLibrary_Files WHERE ID = ?";
          $preps[$this->fpointer] = $_ARCHON->mdb2->prepare($query, array('integer', 'integer', 'integer'), MDB2_PREPARE_RESULT);
          if(pear_isError($preps[$this->fpointer]))
          {
@@ -765,8 +765,9 @@ public function fread($Bytes)
 
       if($row['FilePacket'])
       {
-         $this->fposition += strlen($row['FilePacket']);
-         return $row['FilePacket'];
+         $data = pack('H*', $row['FilePacket']);
+         $this->fposition += strlen($data);
+         return $data;
       }
       else
       {