The attached patch alters the convert.inc and cache.inc files they allow $module/includes/ as a possible path where the views_convert.inc and views_default.inc files might be located.

This is needed so CCK can move those files out of the top level when we re-organize the folders.

The patch is messy because the convert.inc file had windows line endings in it, but the only change is the addition of that path.

CommentFileSizeAuthor
#2 views.patch3.77 KBkarens
includes.patch31.93 KBkarens

Comments

merlinofchaos’s picture

merlinofchaos commented
Status: Needs review » Needs work

I couldn't get this patch to apply; so I went and removed the windows line endings from 3 files and committed that. I hate how those things sometimes sneak in; my editor deals with that invisibly so it's a little hard for me to tell when that's happened, but at least it's easy enough for that editor to change the line endings.

I'm realizing that there are now at least 3 instances where we're searching the module paths. I'm wondering if we can generalize this function to something like views_module_include() to reduce code duplication.

karens’s picture

karens commented
Status: Needs work » Needs review
StatusFileSize
new views.patch3.77 KB

OK, how about this :)

merlinofchaos’s picture

merlinofchaos commented
Status: Needs review » Fixed

Perfect!!

Committed! Thanks!

Anonymous’s picture

Anonymous (not verified) commented
Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for two weeks with no activity.