Author: Jonathan.Wage
Date: 2010-01-21 05:21:10 +0100 (Thu, 21 Jan 2010)
New Revision: 26963
Modified:
plugins/sfSympalPlugin/trunk/data/bin/installer.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenuSiteManager.class.php
Log:
[1.4][sfSympalPlugin][1.0] Fixing installer and php notice
Modified: plugins/sfSympalPlugin/trunk/data/bin/installer.php
===================================================================
--- plugins/sfSympalPlugin/trunk/data/bin/installer.php 2010-01-21 02:40:04 UTC
(rev 26962)
+++ plugins/sfSympalPlugin/trunk/data/bin/installer.php 2010-01-21 04:21:10 UTC
(rev 26963)
@@ -149,7 +149,7 @@
'%s "%s" %s',
sfToolkit::getPhpCli(),
sfConfig::get('sf_root_dir').'/symfony',
- 'sympal:install '.$emailAddress.' '.$username.' '.$password.'
--no-confirmation --db-dsn="'.$db['dsn'].'" --db-username="'.$db['username'].'"
--db-password="'.$db['password'].'" --first-name="'.$firstName.'"
--last-name="'.$lastName.'" --application='.$application
+ 'sympal:install '.$application.' --force-reinstall
--email-address="'.$emailAddress.'" --username="'.$username.'"
--password="'.$password.'" --no-confirmation --db-dsn="'.$db['dsn'].'"
--db-username="'.$db['username'].'" --db-password="'.$db['password'].'"
--first-name="'.$firstName.'" --last-name="'.$lastName.'"'
);
$this->logBlock($command, 'INFO');
$this->getFilesystem()->execute($command, $out, $err);
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenuSiteManager.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenuSiteManager.class.php
2010-01-21 02:40:04 UTC (rev 26962)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenuSiteManager.class.php
2010-01-21 04:21:10 UTC (rev 26963)
@@ -111,7 +111,7 @@
protected function _buildMenu($name, $class)
{
- $rootId = array_search($name, $this->_rootSlugs);
+ $rootId = array_search($name, (array) $this->_rootSlugs);
if (!$rootId)
{
--
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.
