git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-5@10534
709f56b5-9817-0410-a4d7-
c38de5d9e867
2011-02-22 Steffen Ritter <info@steffen-ritter.net>
2011-02-22 Steffen Ritter <info@steffen-ritter.net>
- * Fixed bug #16891: Bug: shopic.php causes a fatal error if parameters GET variable is not an array (Thanks to Helmut Hummel)
+ * Fixed bug #16891: showpic.php causes a fatal error if parameters GET variable is not an array (Thanks to Helmut Hummel)
+ * Fixed bug #16902: Fatal error in tslib_content_text (Thanks to Jo Hasenau)
2011-02-22 Steffen Kamper <steffen@typo3.org>
2011-02-22 Steffen Kamper <steffen@typo3.org>
* @return string Output
*/
public function render($conf = array()) {
* @return string Output
*/
public function render($conf = array()) {
- if ($this->cObj->checkIf($conf['if.'])) {
+ if (isset($conf['if.']) && $this->cObj->checkIf($conf['if.'])) {
$theValue = $this->cObj->cImage($conf['file'], $conf);
if (isset($conf['stdWrap.'])) {
$theValue = $this->cObj->stdWrap($theValue, $conf['stdWrap.']);
$theValue = $this->cObj->cImage($conf['file'], $conf);
if (isset($conf['stdWrap.'])) {
$theValue = $this->cObj->stdWrap($theValue, $conf['stdWrap.']);
* @return string Output
*/
public function render($conf = array()) {
* @return string Output
*/
public function render($conf = array()) {
+ if (!is_array($conf) || empty($conf['scriptSuffix'])) {
+ throw new InvalidArgumentException('Expected parameter $conf[\'scriptSuffix\'] was not given.', 1295705938);
+ }
+
$file = isset($conf['file.'])
? $this->cObj->stdWrap($conf['file'], $conf['file.'])
: $conf['file'];
$file = isset($conf['file.'])
? $this->cObj->stdWrap($conf['file'], $conf['file.'])
: $conf['file'];
* @return string Output
*/
public function render($conf = array()) {
* @return string Output
*/
public function render($conf = array()) {
- $content = $conf['value'];
- unset($conf['value']);
+ $content = '';
+ if (is_array($conf) && isset($conf['value'])) {
+ $content = $conf['value'];
+ unset($conf['value']);
+ }
if(count($conf)) {
$content = $this->cObj->stdWrap($content, $conf);
}
if(count($conf)) {
$content = $this->cObj->stdWrap($content, $conf);
}