Fix get_language_name for unknown languages #123
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If the language is not known, then language_data will not be initialized properly. We should therefore use the user's language input instead.
BenBE
reviewed
Oct 17, 2019
| @@ -611,7 +611,7 @@ public function error() { | |||
| */ | |||
| public function get_language_name() { | |||
| if (GESHI_ERROR_NO_SUCH_LANG == $this->error) { | |||
| return $this->language_data['LANG_NAME'] . ' (Unknown Language)'; | |||
There was a problem hiding this comment.
Better to have this set even in case of errors so there's no need for every location to do some special check for such situations.
There was a problem hiding this comment.
I'm not sure I understand this comment. Are you suggesting to set $this->language_data['LANG_NAME'] in set_language() when the language can't be found?
There was a problem hiding this comment.
Yes. Having one line access $this->language, while everything else accesses $this->language_data['LANGUAGE_NAME'] seems rather inconsistent. And as most of the parser assumes there's some (somewhat) consistent structure in $this->langauge_data anyway we just might opt to have set_language do that setup instead if some error happens.
splitbrain
added a commit
to splitbrain-forks/geshi-1.0
that referenced
this pull request
Apr 29, 2020
As suggested in GeSHi#123 this always initialized the language name, even if the language file cannot be found later.
splitbrain
added a commit
to splitbrain-forks/geshi-1.0
that referenced
this pull request
Apr 29, 2020
As suggested in GeSHi#123 this always initializes the language name, even if the language file cannot be found later.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If the language is not known, then language_data will not be initialized properly. We should therefore use the user's language input instead.