Author: david
Date: Fri Nov 11 09:27:34 2011
New Revision: 10303
Log:
Rollback revisions 10300 and 10299
Modified:
trunk/lib/QubitResourceRoute.class.php
Modified: trunk/lib/QubitResourceRoute.class.php
==============================================================================
--- trunk/lib/QubitResourceRoute.class.php Fri Nov 11 09:19:05 2011
(r10302)
+++ trunk/lib/QubitResourceRoute.class.php Fri Nov 11 09:27:34 2011
(r10303)
@@ -26,24 +26,11 @@
$criteria->addJoin(QubitSlug::OBJECT_ID, QubitObject::ID);
$this->resource = QubitObject::get($criteria)->__get(0);
-
- return parent::bind($context, $params);
- }
-
- public function matchesParameters($params, $context = array())
- {
- if (isset($params['slug']))
+ if (@$params['throw404'] == false && !isset($this->resource))
{
- $criteria = new Criteria;
- $criteria->add(QubitSlug::SLUG, $params['slug']);
- $criteria->addJoin(QubitSlug::OBJECT_ID, QubitObject::ID);
-
- if (null === QubitObject::getOne($criteria))
- {
- return false;
- }
+ throw new sfError404Exception;
}
- return parent::matchesParameters($this->filterParams($params), $context);
+ return parent::bind($context, $params);
}
}
--
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.
