Author: sevein
Date: Tue Dec 6 16:14:22 2011
New Revision: 10371
Log:
Call __toString() magic method explicilty to avoid segfaults in PHP
Modified:
trunk/apps/qubit/modules/term/actions/editAction.class.php
trunk/plugins/sfDcPlugin/modules/sfDcPlugin/actions/editAction.class.php
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/actions/editAction.class.php
trunk/plugins/sfRadPlugin/modules/sfRadPlugin/actions/editAction.class.php
Modified: trunk/apps/qubit/modules/term/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/editAction.class.php Tue Dec 6
16:09:27 2011 (r10370)
+++ trunk/apps/qubit/modules/term/actions/editAction.class.php Tue Dec 6
16:14:22 2011 (r10371)
@@ -72,7 +72,7 @@
$this->form->setValidator('serialNumber', new sfValidatorInteger);
$this->form->setWidget('serialNumber', new sfWidgetFormInputHidden);
- if (1 > strlen($title = $this->resource))
+ if (1 > strlen($title = $this->resource->__toString()))
{
$title = $this->context->i18n->__('Untitled');
}
Modified:
trunk/plugins/sfDcPlugin/modules/sfDcPlugin/actions/editAction.class.php
==============================================================================
--- trunk/plugins/sfDcPlugin/modules/sfDcPlugin/actions/editAction.class.php
Tue Dec 6 16:09:27 2011 (r10370)
+++ trunk/plugins/sfDcPlugin/modules/sfDcPlugin/actions/editAction.class.php
Tue Dec 6 16:14:22 2011 (r10371)
@@ -53,7 +53,7 @@
$title = $this->context->i18n->__('Add new resource');
if (isset($this->getRoute()->resource))
{
- if (1 > strlen($title = $this->resource))
+ if (1 > strlen($title = $this->resource->__toString()))
{
$title = $this->context->i18n->__('Untitled');
}
Modified:
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/actions/editAction.class.php
==============================================================================
---
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/actions/editAction.class.php
Tue Dec 6 16:09:27 2011 (r10370)
+++
trunk/plugins/sfIsadPlugin/modules/sfIsadPlugin/actions/editAction.class.php
Tue Dec 6 16:14:22 2011 (r10371)
@@ -75,7 +75,7 @@
$title = $this->context->i18n->__('Add new archival description');
if (isset($this->getRoute()->resource))
{
- if (1 > strlen($title = $this->resource))
+ if (1 > strlen($title = $this->resource->__toString()))
{
$title = $this->context->i18n->__('Untitled');
}
Modified:
trunk/plugins/sfRadPlugin/modules/sfRadPlugin/actions/editAction.class.php
==============================================================================
--- trunk/plugins/sfRadPlugin/modules/sfRadPlugin/actions/editAction.class.php
Tue Dec 6 16:09:27 2011 (r10370)
+++ trunk/plugins/sfRadPlugin/modules/sfRadPlugin/actions/editAction.class.php
Tue Dec 6 16:14:22 2011 (r10371)
@@ -91,7 +91,7 @@
$title = $this->context->i18n->__('Add new archival description');
if (isset($this->getRoute()->resource))
{
- if (1 > strlen($title = $this->resource))
+ if (1 > strlen($title = $this->resource->__toString()))
{
$title = $this->context->i18n->__('Untitled');
}
--
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.
