Author: david
Date: Tue Nov 29 10:57:31 2011
New Revision: 10356
Log:
Merge r10352:10355 from trunk
Modified:
branches/dcb/ (props changed)
branches/dcb/apps/qubit/modules/term/actions/indexAction.class.php
branches/dcb/apps/qubit/modules/term/templates/indexSuccess.php
branches/dcb/images/logo.png (props changed)
branches/dcb/lib/model/QubitTerm.php
branches/dcb/plugins/qbAclPlugin/lib/vendor/Zend/ (props changed)
branches/dcb/plugins/sfDrupalPlugin/vendor/drupal/ (props changed)
branches/dcb/vendor/symfony/ (props changed)
branches/dcb/vendor/symfony/lib/task/i18n/sfI18nExtractPluginTask.class.php
(props changed)
branches/dcb/vendor/yui/ (props changed)
branches/ica-atom/ (props changed)
branches/ica-atom/apps/qubit/modules/actor/actions/contextMenuComponent.class.php
(props changed)
branches/ica-atom/apps/qubit/modules/term/actions/indexAction.class.php
branches/ica-atom/apps/qubit/modules/term/templates/indexSuccess.php
branches/ica-atom/favicon.ico (props changed)
branches/ica-atom/images/logo.png (props changed)
branches/ica-atom/lib/model/QubitTerm.php
branches/ica-atom/plugins/qbAclPlugin/lib/vendor/Zend/ (props changed)
branches/ica-atom/plugins/sfDrupalPlugin/vendor/drupal/ (props changed)
branches/ica-atom/vendor/symfony/ (props changed)
branches/ica-atom/vendor/symfony/lib/task/i18n/sfI18nExtractPluginTask.class.php
(props changed)
branches/ica-atom/vendor/yui/ (props changed)
Modified: branches/dcb/apps/qubit/modules/term/actions/indexAction.class.php
==============================================================================
--- branches/dcb/apps/qubit/modules/term/actions/indexAction.class.php Mon Nov
28 16:39:02 2011 (r10355)
+++ branches/dcb/apps/qubit/modules/term/actions/indexAction.class.php Tue Nov
29 10:57:31 2011 (r10356)
@@ -48,7 +48,7 @@
$this->forward404();
}
- if (1 > strlen($title = $this->resource))
+ if (1 > strlen($title = $this->resource->__toString()))
{
$title = $this->context->i18n->__('Untitled');
}
Modified: branches/dcb/apps/qubit/modules/term/templates/indexSuccess.php
==============================================================================
--- branches/dcb/apps/qubit/modules/term/templates/indexSuccess.php Mon Nov
28 16:39:02 2011 (r10355)
+++ branches/dcb/apps/qubit/modules/term/templates/indexSuccess.php Tue Nov
29 10:57:31 2011 (r10356)
@@ -90,7 +90,7 @@
<div>
<ul>
<?php foreach ($resource->otherNames as $item): ?>
- <li><?php echo __('UF %1%', array('%1%' =>
render_title($item->getName(array('cultureFallback' => true))))) ?></li>
+ <li><?php echo __('UF %1%', array('%1%' => render_title($item)))
?></li>
<?php endforeach; ?>
</ul>
</div>
Modified: branches/dcb/lib/model/QubitTerm.php
==============================================================================
--- branches/dcb/lib/model/QubitTerm.php Mon Nov 28 16:39:02 2011
(r10355)
+++ branches/dcb/lib/model/QubitTerm.php Tue Nov 29 10:57:31 2011
(r10356)
@@ -956,7 +956,7 @@
{
if (QubitTerm::ROOT_ID != $item->id)
{
- $label = render_title($item->getName(array('cultureFallback' =>
true)));
+ $label = render_title($item);
$node['label'] = truncate_text($label, 50);
@@ -974,7 +974,7 @@
}
else
{
- $label =
render_title($options['currentNode']->taxonomy->getName(array('cultureFallback'
=> true)));
+ $label = render_title($options['currentNode']->taxonomy);
$node['label'] = truncate_text($label, 50);
Modified:
branches/ica-atom/apps/qubit/modules/term/actions/indexAction.class.php
==============================================================================
--- branches/ica-atom/apps/qubit/modules/term/actions/indexAction.class.php
Mon Nov 28 16:39:02 2011 (r10355)
+++ branches/ica-atom/apps/qubit/modules/term/actions/indexAction.class.php
Tue Nov 29 10:57:31 2011 (r10356)
@@ -48,7 +48,7 @@
$this->forward404();
}
- if (1 > strlen($title = $this->resource))
+ if (1 > strlen($title = $this->resource->__toString()))
{
$title = $this->context->i18n->__('Untitled');
}
Modified: branches/ica-atom/apps/qubit/modules/term/templates/indexSuccess.php
==============================================================================
--- branches/ica-atom/apps/qubit/modules/term/templates/indexSuccess.php
Mon Nov 28 16:39:02 2011 (r10355)
+++ branches/ica-atom/apps/qubit/modules/term/templates/indexSuccess.php
Tue Nov 29 10:57:31 2011 (r10356)
@@ -90,7 +90,7 @@
<div>
<ul>
<?php foreach ($resource->otherNames as $item): ?>
- <li><?php echo __('UF %1%', array('%1%' =>
render_title($item->getName(array('cultureFallback' => true))))) ?></li>
+ <li><?php echo __('UF %1%', array('%1%' => render_title($item)))
?></li>
<?php endforeach; ?>
</ul>
</div>
Modified: branches/ica-atom/lib/model/QubitTerm.php
==============================================================================
--- branches/ica-atom/lib/model/QubitTerm.php Mon Nov 28 16:39:02 2011
(r10355)
+++ branches/ica-atom/lib/model/QubitTerm.php Tue Nov 29 10:57:31 2011
(r10356)
@@ -956,7 +956,7 @@
{
if (QubitTerm::ROOT_ID != $item->id)
{
- $label = render_title($item->getName(array('cultureFallback' =>
true)));
+ $label = render_title($item);
$node['label'] = truncate_text($label, 50);
@@ -974,7 +974,7 @@
}
else
{
- $label =
render_title($options['currentNode']->taxonomy->getName(array('cultureFallback'
=> true)));
+ $label = render_title($options['currentNode']->taxonomy);
$node['label'] = truncate_text($label, 50);
--
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.
