Author: jablko
Date: Fri Oct 29 15:38:30 2010
New Revision: 8694
Log:
Update page slug
Modified:
trunk/lib/helper/QubitHelper.php
trunk/lib/model/QubitObject.php
trunk/lib/model/QubitStaticPage.php
Modified: trunk/lib/helper/QubitHelper.php
==============================================================================
--- trunk/lib/helper/QubitHelper.php Fri Oct 29 15:38:03 2010 (r8693)
+++ trunk/lib/helper/QubitHelper.php Fri Oct 29 15:38:30 2010 (r8694)
@@ -117,9 +117,9 @@
function render_value($value)
{
- //ProjectConfiguration::getActive()->loadHelpers('Text');
+ ProjectConfiguration::getActive()->loadHelpers('Text');
- //$value = auto_link_text($value);
+ $value = auto_link_text($value);
// Simple lists
$value = preg_replace('/(?:^\*.*\r?\n)*(?:^\*.*)/m', "<ul>\n$0\n</ul>",
$value);
Modified: trunk/lib/model/QubitObject.php
==============================================================================
--- trunk/lib/model/QubitObject.php Fri Oct 29 15:38:03 2010 (r8693)
+++ trunk/lib/model/QubitObject.php Fri Oct 29 15:38:30 2010 (r8694)
@@ -196,7 +196,7 @@
{
if (!isset($connection))
{
- $connection =
QubitTransactionFilter::getConnection(QubitInformationObject::DATABASE_NAME);
+ $connection =
QubitTransactionFilter::getConnection(QubitObject::DATABASE_NAME);
}
parent::insert($connection);
@@ -211,7 +211,7 @@
{
$statement->execute(array($this->id, QubitSlug::random()));
- return;
+ return $this;
}
try
Modified: trunk/lib/model/QubitStaticPage.php
==============================================================================
--- trunk/lib/model/QubitStaticPage.php Fri Oct 29 15:38:03 2010 (r8693)
+++ trunk/lib/model/QubitStaticPage.php Fri Oct 29 15:38:30 2010 (r8694)
@@ -34,6 +34,39 @@
return parent::insert($connection);
}
+ protected function update($connection = null)
+ {
+ if (!isset($connection))
+ {
+ $connection =
QubitTransactionFilter::getConnection(QubitStaticPage::DATABASE_NAME);
+ }
+
+ $statement = $connection->prepare('
+ UPDATE '.QubitSlug::TABLE_NAME.'
+ SET '.QubitSlug::SLUG.' = ?
+ WHERE '.QubitSlug::OBJECT_ID.' = ?');
+
+ if (1 > strlen($this->slug))
+ {
+ $statement->execute(array(QubitSlug::random(), $this->id));
+
+ return;
+ }
+
+ try
+ {
+ $statement->execute(array($this->slug, $this->id));
+ }
+
+ // Collision? Try random, digit and letter slug
+ catch (PDOException $e)
+ {
+ $statement->execute(array(QubitSlug::random(), $this->id));
+ }
+
+ return parent::update($connection);
+ }
+
public function isProtected()
{
return $this->slug == 'about' || $this->slug == 'home';
--
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.
