Author: sevein
Date: Sat Apr 21 16:47:22 2012
New Revision: 11491
Log:
Call __toString() magic method explicitly, regarding to issue 1995 (segfault).
Modified:
trunk/plugins/sfDcPlugin/lib/sfDcPlugin.class.php
trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php
trunk/plugins/sfModsPlugin/lib/sfModsPlugin.class.php
trunk/plugins/sfRadPlugin/lib/sfRadPlugin.class.php
Modified: trunk/plugins/sfDcPlugin/lib/sfDcPlugin.class.php
==============================================================================
--- trunk/plugins/sfDcPlugin/lib/sfDcPlugin.class.php Sat Apr 21 00:02:56
2012 (r11490)
+++ trunk/plugins/sfDcPlugin/lib/sfDcPlugin.class.php Sat Apr 21 16:47:22
2012 (r11491)
@@ -47,9 +47,9 @@
$resourceAndPublicationStatus = array();
- if (0 < strlen($this->resource))
+ if (0 < strlen($title = $this->resource->__toString))
{
- $resourceAndPublicationStatus[] = $this->resource;
+ $resourceAndPublicationStatus[] = $title;
}
$publicationStatus = $this->resource->getPublicationStatus();
Modified: trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php
==============================================================================
--- trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php Sat Apr 21
00:02:56 2012 (r11490)
+++ trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php Sat Apr 21
16:47:22 2012 (r11491)
@@ -60,9 +60,9 @@
$titleAndPublicationStatus = array();
- if (0 < strlen($this->resource->__toString()))
+ if (0 < strlen($title = $this->resource->__toString()))
{
- $titleAndPublicationStatus[] = $this->resource->__toString();
+ $titleAndPublicationStatus[] = $title;
}
$publicationStatus = $this->resource->getPublicationStatus();
Modified: trunk/plugins/sfModsPlugin/lib/sfModsPlugin.class.php
==============================================================================
--- trunk/plugins/sfModsPlugin/lib/sfModsPlugin.class.php Sat Apr 21
00:02:56 2012 (r11490)
+++ trunk/plugins/sfModsPlugin/lib/sfModsPlugin.class.php Sat Apr 21
16:47:22 2012 (r11491)
@@ -44,7 +44,7 @@
if (isset($this->resource->levelOfDescription))
{
- $levelOfDescriptionAndIdentifier[] = $this->resource->levelOfDescription;
+ $levelOfDescriptionAndIdentifier[] =
$this->resource->levelOfDescription->__toString();
}
if (isset($this->resource->identifier))
@@ -59,9 +59,9 @@
$resourceAndPublicationStatus = array();
- if (0 < strlen($this->resource))
+ if (0 < strlen($title = $this->resource->__toString()))
{
- $resourceAndPublicationStatus[] = $this->resource;
+ $resourceAndPublicationStatus[] = $title;
}
$publicationStatus = $this->resource->getPublicationStatus();
Modified: trunk/plugins/sfRadPlugin/lib/sfRadPlugin.class.php
==============================================================================
--- trunk/plugins/sfRadPlugin/lib/sfRadPlugin.class.php Sat Apr 21 00:02:56
2012 (r11490)
+++ trunk/plugins/sfRadPlugin/lib/sfRadPlugin.class.php Sat Apr 21 16:47:22
2012 (r11491)
@@ -45,7 +45,7 @@
if (isset($this->resource->levelOfDescription))
{
- $levelOfDescriptionAndIdentifier[] = $this->resource->levelOfDescription;
+ $levelOfDescriptionAndIdentifier[] =
$this->resource->levelOfDescription->__toString();
}
if (isset($this->resource->identifier))
@@ -60,9 +60,9 @@
$titleAndPublicationStatus = array();
- if (0 < strlen($this->resource->__toString()))
+ if (0 < strlen($title = $this->resource->__toString()))
{
- $titleAndPublicationStatus[] = $this->resource->__toString();
+ $titleAndPublicationStatus[] = $title;
}
$publicationStatus = $this->resource->getPublicationStatus();
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
