[SOLVED] Theme Admin tabs are a complete mess

nivekiam
nivekiam's picture

Joined: 2002-12-10
Posts: 16504
Posted: Thu, 2005-07-21 03:15

Bug report submitted here, http://sourceforge.net/tracker/index.php?func=detail&aid=1242035&group_id=7130&atid=107130

See attached image. :D

.

AttachmentSize
themes_admin_tabs.png57.58 KB
 
valiant

Joined: 2003-01-04
Posts: 32509
Posted: Thu, 2005-07-21 06:38

nivekiam, you had an cvs update "error" (a merge), you can clearly see that.
the
<<<<<<<<<<<<< AdminThemes.inc,
foo
============
bar
>>>>>>>>>>>> 1.6

are that. do a cvs update -C AdminThemes.inc templates/AdminThemes.tpl
in modules/core.

 
nivekiam
nivekiam's picture

Joined: 2002-12-10
Posts: 16504
Posted: Thu, 2005-07-21 14:01

Thank you valiant, that fixed it, just had to clear the template cache.

The reason I posted this was because after I first seen this. I re-updated. Still had the problem, then I deleted my entire code base and did a fresh checkout, cleared template cache and still had the problem.

Maybe there was a glitch with anon CVS last night. I don't know.