Author: Jonathan.Wage
Date: 2010-02-18 04:05:13 +0100 (Thu, 18 Feb 2010)
New Revision: 28108
Modified:
plugins/sfSympalPlugin/trunk/lib/form/doctrine/PluginsfSympalContentTypeForm.class.php
plugins/sfSympalPlugin/trunk/lib/form/sfSympalForm.class.php
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItemTable.class.php
Log:
[1.4][sfSympalPlugin][1.0] Removing other unnecessary uses of sfSympalContext
instance
Modified:
plugins/sfSympalPlugin/trunk/lib/form/doctrine/PluginsfSympalContentTypeForm.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/form/doctrine/PluginsfSympalContentTypeForm.class.php
2010-02-18 02:58:58 UTC (rev 28107)
+++
plugins/sfSympalPlugin/trunk/lib/form/doctrine/PluginsfSympalContentTypeForm.class.php
2010-02-18 03:05:13 UTC (rev 28108)
@@ -13,7 +13,7 @@
{
parent::setup();
- $plugins =
sfSympalContext::getInstance()->getSympalConfiguration()->getContentTypePlugins();
+ $plugins =
$this->getSympalContext()->getSympalConfiguration()->getContentTypePlugins();
$plugins = array_combine($plugins, $plugins);
$plugins = array_merge(array('' => ''), $plugins);
Modified: plugins/sfSympalPlugin/trunk/lib/form/sfSympalForm.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/form/sfSympalForm.class.php
2010-02-18 02:58:58 UTC (rev 28107)
+++ plugins/sfSympalPlugin/trunk/lib/form/sfSympalForm.class.php
2010-02-18 03:05:13 UTC (rev 28108)
@@ -2,6 +2,11 @@
class sfSympalForm extends sfSympalExtendClass
{
+ public function getSympalContext($site = null)
+ {
+ return sfSympalContext::getInstance($site);
+ }
+
public function getRequiredFields(sfValidatorSchema $validatorSchema = null,
$format = null)
{
if ($validatorSchema === null)
Modified:
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
2010-02-18 02:58:58 UTC (rev 28107)
+++
plugins/sfSympalPlugin/trunk/lib/model/doctrine/PluginsfSympalContentTable.class.php
2010-02-18 03:05:13 UTC (rev 28108)
@@ -157,7 +157,6 @@
public function getBaseQuery($alias = 'c')
{
- $sympalContext = sfSympalContext::getInstance();
$q = Doctrine_Query::create()
->from('sfSympalContent '.$alias)
->leftJoin($alias.'.Groups g')
@@ -173,10 +172,8 @@
->innerJoin($alias.'.Type t')
// Don't use param to work around Doctrine pgsql bug
// with limit subquery and number of params
- ->innerJoin(sprintf($alias.".Site si WITH si.slug = '%s'",
$sympalContext->getSiteSlug()));
+ ->innerJoin(sprintf($alias.".Site si WITH si.slug = '%s'",
sfConfig::get('sf_app')));
- $user = sfContext::getInstance()->getUser();
-
if (sfSympalConfig::isI18nEnabled('sfSympalContentSlot'))
{
$q->leftJoin('s.Translation slt');
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItemTable.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItemTable.class.php
2010-02-18 02:58:58 UTC (rev 28107)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItemTable.class.php
2010-02-18 03:05:13 UTC (rev 28108)
@@ -47,7 +47,7 @@
->addSelect('c.id, c.custom_path, c.slug, c.date_published')
->leftJoin('c.Type ct')
->addSelect('ct.id, ct.name, ct.default_path, ct.slug')
- ->innerJoin('m.Site s WITH s.slug = ?',
sfSympalContext::getInstance()->getSiteSlug())
+ ->innerJoin('m.Site s WITH s.slug = ?', sfConfig::get('sf_app'))
->orderBy('m.root_id, m.lft ASC');
if (sfSympalConfig::isI18nEnabled('sfSympalContent'))
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" 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/symfony-svn?hl=en.
