Author: david
Date: Mon Oct 25 13:54:21 2010
New Revision: 8481
Log:
Explicitly call __toString() (PHP bug http://bugs.php.net/bug.php?id=47522).
Fixes issue #1825.
Modified:
trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php
Modified: trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php
==============================================================================
--- trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php Mon Oct 25
13:45:45 2010 (r8480)
+++ trunk/plugins/sfIsadPlugin/lib/sfIsadPlugin.class.php Mon Oct 25
13:54:21 2010 (r8481)
@@ -45,7 +45,7 @@
if (isset($this->resource->levelOfDescription))
{
- $levelOfDescriptionAndIdentifier[] = $this->resource->levelOfDescription;
+ $levelOfDescriptionAndIdentifier[] =
$this->resource->levelOfDescription->__toString();
}
if (isset($this->resource->identifier))
@@ -58,22 +58,22 @@
$string[] = implode($levelOfDescriptionAndIdentifier, ' ');
}
- $resourceAndPublicationStatus = array();
+ $titleAndPublicationStatus = array();
- if (0 < strlen($this->resource))
+ if (0 < strlen($this->resource->__toString()))
{
- $resourceAndPublicationStatus[] = $this->resource;
+ $titleAndPublicationStatus[] = $this->resource->__toString();
}
$publicationStatus = $this->resource->getPublicationStatus();
if (isset($publicationStatus) && QubitTerm::PUBLICATION_STATUS_DRAFT_ID ==
$publicationStatus->statusId)
{
- $resourceAndPublicationStatus[] = "($publicationStatus->status)";
+ $titleAndPublicationStatus[] =
'('.$publicationStatus->status->__toString().')';
}
- if (0 < count($resourceAndPublicationStatus))
+ if (0 < count($titleAndPublicationStatus))
{
- $string[] = implode($resourceAndPublicationStatus, ' ');
+ $string[] = implode($titleAndPublicationStatus, ' ');
}
return implode(' - ', $string);
--
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.
