This post is more of refrence for grg and I to keep track of whats been happening with our cms.

I have created a new tag to point to the last revision we have merged into the trunk. as follows:

svn copy http://svn.malarky.co.nz/sfMCMSPlugin/branches/1.2 http://svn.malarky.co.nz/sfMCMSPlugin/tags/1.2_last_merge_to_trunk

so then to merge the new stuff up stream in future we can just go like:

svn log -v --stop-on-copy http://svn.malarky.co.nz/sfMCMSPlugin/tags/1.2_last_merge_to_trunk

this will give us the first revision number to use. then we can do the merge. (from inside a trunk working copy):

svn merge -r 607:HEAD http://svn.malarky.co.nz/sfMCMSPlugin/branches/1.2

(where 607 is the revision you got from the previous command)

after the merge, remember to move the tag to the newest 1.2 branch commit. a simple delete and re-copy should suffice?

When returning a rendered partial from an action like:

return $this->renderPartial('action/partial');

you can use all the $this->variables assigned in that action in the view, UNLESS you pass an array of them into the partial:

return $this->renderPartial('action/partial',array('var'=>'this stops us using any this->vars'));

which then becomes all you can use in there.

Just got dev status on the modal plugin and have released a new updated version. You can check it out here: http://www.symfony-project.org/plugins/sfModalBoxPlugin