Changeset 94456 in spip-zone

Timestamp:

Jan 5, 2016, 6:48:11 PM (5 years ago)

Author:

cedric@…

Message:

Bugfix propre du cas fonction inexistante : this->language_dataREGEXPS?[] n'est pas forcement un array mais peut etre une string, comme dans le cas defini pour le langage 'css'. On ajout le test, et un log verbeux en cas d'erreur restante

Location:

_plugins_/coloration_code/trunk

Files:

• inc/spip_geshi.php (modified) (2 diffs)
• paquet.xml (modified) (1 diff)
• plugin.xml (modified) (1 diff)

_plugins_/coloration_code/trunk/inc/spip_geshi.php

@@ -62 +62 @@
         function handle_multiline_regexps($matches) {
                 $key = $this->_hmr_key;
-                if (    isset($this->language_data['REGEXPS'][$key][SPIP_GESHI_REGEXP_FUNCTION])
-                  and $func = $this->language_data['REGEXPS'][$key][SPIP_GESHI_REGEXP_FUNCTION]
-                  and function_exists($func)) {
-                        return $func($matches, $this);
+                if (  is_array($this->language_data['REGEXPS'][$key])
+                  and isset($this->language_data['REGEXPS'][$key][SPIP_GESHI_REGEXP_FUNCTION])
+                  and $func = $this->language_data['REGEXPS'][$key][SPIP_GESHI_REGEXP_FUNCTION]) {
+
+                        if (function_exists($func)) {
+                                return $func($matches, $this);
+                        }
+                        spip_log("$func inexistante dans this->language_data['REGEXPS'][$key]=" . var_export($this->language_data['REGEXPS'][$key],true), "geshi" . _LOG_ERREUR);
                 }
 
@@ -80 +84 @@
         function handle_singleline_regexps($stuff_to_parse, $regexp, $key) {
 
-                if (    isset($regexp[SPIP_GESHI_REGEXP_FUNCTION])
+                if (  is_array($regexp)
+                  and isset($regexp[SPIP_GESHI_REGEXP_FUNCTION])
                   and $func = $regexp[SPIP_GESHI_REGEXP_FUNCTION]
                   and function_exists($func)) {

_plugins_/coloration_code/trunk/paquet.xml

@@ -2 +2 @@
         prefix="coloration_code"
         categorie="edition"
-        version="0.9.3"
+        version="0.9.4"
         etat="stable"
         compatibilite="[2.0.0;3.1.*]"

_plugins_/coloration_code/trunk/plugin.xml

@@ -16 +16 @@
         <icon>coloration-32.png</icon>
         <auteur>Pierre Andrews (Mortimer) - ARNO*</auteur>
-        <version>0.9.3</version>
+        <version>0.9.4</version>
         <etat>stable</etat>
         <description>