zend MDL-22103 update Zend library to 1.10
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
* @category Zend
|
||||
* @package Zend_Gdata
|
||||
* @subpackage App
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id$
|
||||
*/
|
||||
@@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/BaseMediaSource.php';
|
||||
* @category Zend
|
||||
* @package Zend_Gdata
|
||||
* @subpackage App
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
*/
|
||||
class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource
|
||||
@@ -40,7 +40,7 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource
|
||||
/**
|
||||
* The filename which is represented
|
||||
*
|
||||
* @var string
|
||||
* @var string
|
||||
*/
|
||||
protected $_filename = null;
|
||||
|
||||
@@ -50,7 +50,7 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource
|
||||
* @var string
|
||||
*/
|
||||
protected $_contentType = null;
|
||||
|
||||
|
||||
/**
|
||||
* Create a new Zend_Gdata_App_MediaFileSource object.
|
||||
*
|
||||
@@ -60,7 +60,7 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource
|
||||
{
|
||||
$this->setFilename($filename);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Return the MIME multipart representation of this MediaEntry.
|
||||
*
|
||||
@@ -69,7 +69,7 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource
|
||||
*/
|
||||
public function encode()
|
||||
{
|
||||
if ($this->getFilename() !== null &&
|
||||
if ($this->getFilename() !== null &&
|
||||
is_readable($this->getFilename())) {
|
||||
|
||||
// Retrieves the file, using the include path
|
||||
@@ -84,11 +84,11 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource
|
||||
return $result;
|
||||
} else {
|
||||
require_once 'Zend/Gdata/App/IOException.php';
|
||||
throw new Zend_Gdata_App_IOException("Error reading file - " .
|
||||
throw new Zend_Gdata_App_IOException("Error reading file - " .
|
||||
$this->getFilename() . '. File is not readable.');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the filename associated with this reader.
|
||||
*
|
||||
@@ -101,7 +101,7 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource
|
||||
|
||||
/**
|
||||
* Set the filename which is to be read.
|
||||
*
|
||||
*
|
||||
* @param string $value The desired file handle.
|
||||
* @return Zend_Gdata_App_MediaFileSource Provides a fluent interface.
|
||||
*/
|
||||
@@ -110,8 +110,8 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource
|
||||
$this->_filename = $value;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
/**
|
||||
* The content type for the file attached (example image/png)
|
||||
*
|
||||
* @return string The content type
|
||||
@@ -121,7 +121,7 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource
|
||||
return $this->_contentType;
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* Set the content type for the file attached (example image/png)
|
||||
*
|
||||
* @param string $value The content type
|
||||
@@ -132,7 +132,7 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource
|
||||
$this->_contentType = $value;
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Alias for getFilename().
|
||||
*
|
||||
@@ -142,5 +142,5 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource
|
||||
{
|
||||
return $this->getFilename();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user