Skip to content

Feature/smileys #16

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Feature/smileys #16

wants to merge 3 commits into from

Conversation

greenship24
Copy link

Goal

  • Symlink smileys so they work as the docs state

Relevant links

Summary of changes

  • mv original lib/images/smileys dir to lib/images/smileys.core like plugins, etc.
  • extend loop for plugins,tpl to do same for images/smileys dir for symlink to /storage

Testing

  • I've tested this locally on a test instance of mine that was broken before (ie. I had smileys.local.conf from a custom smiley pack and the local images obviously were not picked up) and changed to this image and they worked again
  • I would appreciate someone testing more against a test instance of their own to confirm that nothing is broken otherwise

CS added 3 commits September 4, 2024 12:06
Allow custom smileys to persist in container setups
f5d02d9 
- mv original images dir to .core like plugins, etc.
- adjust loop to include images dir for symlink to /storage
v2 with additional loop using smileys subdir
108df27
v3 that reuses existing loop
8d51db7
@splitbrain
Copy link
Contributor

Thanks for submitting this. However, I think I would prefer a solution that accesses files in lib/images via a PHP dispatcher. This dispatcher could look for custom images in in conf/images where conf is defined by DOKU_CONF - this would make customizing upgrade safe and would work in a farm setup.

@greenship24
Copy link
Author

Well sadly I don't know/code PHP so I could not be of assistance with that.

splitbrain added a commit to dokuwiki/dokuwiki that referenced this pull request Sep 8, 2024
@splitbrain
use a dispatcher to access static image files
944e9ba 
This makes it possible to replace default images in an update safe way.
It also addresses the issue raised in dokuwiki/docker#16

A .htaccess rewrite catches any direct accesses that might come in from
plugins.
@splitbrain splitbrain mentioned this pull request Sep 8, 2024
Open
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@greenship24 @splitbrain