Author: sevein
Date: Fri Jan 13 11:32:12 2012
New Revision: 10668
Log:
Fix unfortunate bug where a regex was not capturing the id number correctly,
producing a fatal error (id not found) or even data replacement (capturing
wrong id number of an existing record), fixes issue 2219
Modified:
trunk/apps/qubit/modules/contactinformation/actions/editComponent.class.php
trunk/apps/qubit/modules/settings/templates/listSuccess.php
Modified:
trunk/apps/qubit/modules/contactinformation/actions/editComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/contactinformation/actions/editComponent.class.php
Fri Jan 13 00:03:05 2012 (r10667)
+++ trunk/apps/qubit/modules/contactinformation/actions/editComponent.class.php
Fri Jan 13 11:32:12 2012 (r10668)
@@ -119,7 +119,7 @@
{
if (isset($item['id']))
{
- $this->contactInformation =
QubitContactInformation::getById(preg_replace('/^(.*)(\d+)$/', '$2',
$item['id']));
+ $this->contactInformation =
QubitContactInformation::getById(preg_replace('/^(.*)\/(\d+)$/', '$1',
$item['id']));
}
else
{
Modified: trunk/apps/qubit/modules/settings/templates/listSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/settings/templates/listSuccess.php Fri Jan 13
00:03:05 2012 (r10667)
+++ trunk/apps/qubit/modules/settings/templates/listSuccess.php Fri Jan 13
11:32:12 2012 (r10668)
@@ -263,7 +263,7 @@
<!-- Job scheduling settings -->
<fieldset class="collapsible collapsed">
<legend><?php echo __('Job scheduling') ?></legend>
- <p>Specific Gearman job server options can be found in
config/gearman.yml.</p>
+ <p><?php echo __('Specific Gearman job server options can be found in
config/gearman.yml.') ?></p>
<form action="<?php echo url_for('settings/list') ?>" method="post">
<table class="list">
<thead>
--
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.
