For the 7.x branch it make sense to use libraries API (probably need contrib) and then add a drush make file to download the geshi library.

CommentFileSizeAuthor
#3 1125804-libraries-API.patch13.01 KBboombatower

Comments

boombatower’s picture

boombatower commented

Looks like _geshifilter_check_geshi_library() would need replacing.

Looks like even a todo in code: // TODO: change the default value to something like 'sites/all/libraries/geshi' (possibly using the Libraries API module)

boombatower’s picture

boombatower commented
Title: Support Libraries API and add drush make » Support Libraries API
Assigned: Unassigned » boombatower
Status: Active » Needs review
StatusFileSize
new 1125804-libraries-API.patch13.01 KB

The patch provides as straight a port to libraries API as I can do, didn't change logic of code.

I made a new issue for drush make file, #1125856: Add drush make file to download geshi library.

soxofaan’s picture

soxofaan commented

Hi,

Looks very cool, thanks.

Unfortunately, real life constraints prevent me to allocate a decent amount of time to review and try this properly in the short term (I'm looking for a co-maintainer).
If you want, I can add you as maintainer, so you can commit directly yourself?

marked #584308: support/integration with Libraries API as duplicate

boombatower’s picture

boombatower commented

Sure, not sure I will be able to devote a lot of time to this either, but improving to I can use cleanly with drush make on a Drupal 7 site. Probably double check a few more things and make a release if ok with you.

soxofaan’s picture

soxofaan commented

I just added you as maintainer,
thanks for contributing!

boombatower’s picture

boombatower commented
Status: Needs review » Fixed

Committed.

Derjyn’s picture

Derjyn commented
Category: feature » bug
Status: Fixed » Needs work

Why the move to Libraries API? It was fine before... Now I get this error: "Call to undefined function libraries_load()" when trying to go to the Geshi admin settings page. Libraries module is active, and I tried with both dev and suggested versions (also combos of dev/suggested Geshi).

boombatower’s picture

boombatower commented

It's is the proper way to do third party libraries. It also removes a bunch of code that each third party integration has to deal with, make it more robust, and more configurable.

 geshifilter.admin.inc     |   39 ++++------------------------
 geshifilter.conflicts.inc |    8 +++---
 geshifilter.inc           |   61 ++------------------------------------------
 geshifilter.info          |    3 +-
 geshifilter.install       |    9 ++++++-
 geshifilter.module        |   34 +++++++++++++++++++++++--
 geshifilter.pages.inc     |   10 +++---
 7 files changed, 59 insertions(+), 105 deletions(-)

Did you use the 2.x-dev like it says? based on the error I'd say you were running 1.x. I run it daily on a project I am working on...it works like a charm.

boombatower’s picture

boombatower commented
Status: Needs work » Postponed (maintainer needs more info)
boombatower’s picture

boombatower commented
Status: Postponed (maintainer needs more info) » Fixed

Please re-open if still having trouble. I am assuming you were not running 2.x-dev.

Status: Fixed » Closed (fixed)

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