PHPTemplate has been destined to move to core for a while, here is the patch and the updated version of phptemplate.

As discussed on the mailing list, this includes the phptemplate port of bluemarine, and moves the link settings to admin/themes/settings.

CommentFileSizeAuthor
#3 fix-phptemplate-regressions.patch9.06 KBTDobes
#1 phptemplate4core.tar_0.bz219.78 KBadrian
phptemplate4core.tar.bz221.32 KBadrian

Comments

adrian’s picture

adrian commented
StatusFileSize
new phptemplate4core.tar_0.bz219.78 KB

Here is an updated phptemplate that :

1) uses node_load to retrieve the node, if on a node page.
2) changes the seqid variable to id.
3) removes the readme.txt file
4) does away with the template.php file, and moves the functionality into phptemplate.engine

dries’s picture

dries commented

Committed. Thanks Adrian.

TDobes’s picture

TDobes commented
Title: Move PHPTemplate to core. » Fix phptemplate regressions
Version: 4.6.0 »
Assigned: vertice@www.drop.org » TDobes
Category: task » bug
Priority: Normal » Critical
StatusFileSize
new fix-phptemplate-regressions.patch9.06 KB

The recent commit of phptemplate caused a number of problems for non-phptemplate themes. A patch is attached to address these issues. Changes include:
* parsing of the primary/secondary links has been moved out of phptemplate and into theme_get_setting.
* unnecessary and XHTML-invalidating duplicate div#help removed from themes/bluemarine/page.tpl.php (this is already generated by theme_help)
* weird generation of the "edit primary/secondary links" messages removed from bluemarine and placed in theme.inc
* unnecessary changes to themes/bluemarine/style.css rolled back (the phptemplate bluemarine had an older version of style.css than the one in core)
* chameleon updated to work with new link scheme (passes links through theme_links)

Please review and/or apply.

I recommend that the themes/bluemarine/xtemplate.xtmpl file be deleted in the next CVS commit as well. I assume it's an accidental leftover. Also, please look into the parse error in database/updates.inc. It looks like another patch might have been mixed up accidentially.

After this patch lands, I'll update all contrib themes and the theme upgrade guide.

adrian’s picture

adrian commented

re: point #1 , that is a better solution.

It's all going to be removed in the next week to be replaced with a menu system approach, but cool. thnx.

TDobes’s picture

TDobes commented

Yes -- I expected a better solution was coming, but this will keep things functioning in the meantime. Since the ETA is so near on the menu-based approach, I'll leave contrib and the upgrading guide alone till it lands.

dries’s picture

dries commented

Committed to HEAD. Thanks TDobes. Instead of upgrading the contrib themes, your time might be better spent investigating a proper menu-integration solution. Either way, updating the contrib themes is a good idea. Thanks a lot.

Anonymous’s picture

(not verified) commented