Changeset 3128891

Timestamp:

07/31/2024 03:17:38 PM (20 months ago)

Author:

urvanov

Message:

2.8.37 some php warnings

Location:

urvanov-syntax-highlighter/trunk

Files:

• class-urvanov-syntax-highlighter-langs.php (modified) (1 diff)
• class-urvanov-syntax-highlighter-plugin.php (modified) (5 diffs)
• readme.txt (modified) (3 diffs)

urvanov-syntax-highlighter/trunk/class-urvanov-syntax-highlighter-langs.php

@@ -84 +84 @@
     public function detect($path, $fallback_id = NULL) {
         $this->load();
-        extract(pathinfo($path));
+        if ( '' != $path) {
+            extract(pathinfo($path));
+        }
 
         // If fallback id if given

urvanov-syntax-highlighter/trunk/class-urvanov-syntax-highlighter-plugin.php

@@ -4 +4 @@
 Plugin URI: https://github.com/urvanov-ru/crayon-syntax-highlighter
 Description: Supports multiple languages, themes, highlighting from a URL, local file or post text.
-Version: 2.8.36
+Version: 2.8.37
 Author: Fedor Urvanov, Aram Kocharyan
 Author URI: https://urvanov.ru
@@ -35 +35 @@
 
 Urvanov_Syntax_Highlighter_Global::set_info(array(
-    'Version' => '2.8.36',
-    'Date' => '31th March 2024',
+    'Version' => '2.8.37',
+    'Date' => '31th August 2024',
     'AuthorName' => 'Fedor Urvanov & Aram Kocharyan',
     'PluginURI' => 'https://github.com/urvanov-ru/crayon-syntax-highlighter',
@@ -741 +741 @@
 
     public static function pre_comment_text($text, $comment, $args ) {
+        // according to
+        // https://developer.wordpress.org/reference/hooks/comment_text/
+        // this filter calls in different places.
+        //
+        // https://github.com/WordPress/WordPress/blob/01876b090612c0d2825a896a7ba0e7fd6dd6decc/wp-includes/comment.php#L48
+        // calls it with $comment === null
+        //
+        // https://github.com/WordPress/WordPress/blob/bb26471543b104e047f9f4b264810adc372cd6ce/wp-includes/comment-template.php#L1094
+        // calls it with the object $comment = get_comment( $comment_id ); as $comment
+        if ($comment === null) {
+            return $text;
+        }
+        // We process only call with filled $comment
         $comment_id = strval($comment->comment_ID);
         if (array_key_exists($comment_id, self::$comment_captures)) {
@@ -749 +762 @@
     }
 
-    public static function comment_text($text) {
-        global $comment;
+    public static function comment_text($text, $comment, $args ) {
+        // according to
+        // https://developer.wordpress.org/reference/hooks/comment_text/
+        // this filter calls in different places.
+        //
+        // https://github.com/WordPress/WordPress/blob/01876b090612c0d2825a896a7ba0e7fd6dd6decc/wp-includes/comment.php#L48
+        // calls it with $comment === null
+        //
+        // https://github.com/WordPress/WordPress/blob/bb26471543b104e047f9f4b264810adc372cd6ce/wp-includes/comment-template.php#L1094
+        // calls it with the object $comment = get_comment( $comment_id ); as $comment
+        if ($comment === null) {
+            return $text;
+        }
+        // We process only call with filled $comment
         $comment_id = strval($comment->comment_ID);
         // Find if this post has Crayons
@@ -1346 +1371 @@
              Prevents Crayon from being formatted by the filters, and also keeps original comment formatting. */
             add_filter('comment_text', 'Urvanov_Syntax_Highlighter_Plugin::pre_comment_text', 1, 3);
-            add_filter('comment_text', 'Urvanov_Syntax_Highlighter_Plugin::comment_text', 100);
+            add_filter('comment_text', 'Urvanov_Syntax_Highlighter_Plugin::comment_text', 100, 3);
         }
 

urvanov-syntax-highlighter/trunk/readme.txt

@@ -4 +4 @@
 License: GPLv3 or later
 Tags: syntax highlighter, syntax, highlighter, highlighting, crayon, code highlighter, bbpress
-Requires at least: 6.3
-Tested up to: 6.4.3
+Requires at least: 6.6
+Tested up to: 6.6.1
 Stable tag: 2.8.36
 
@@ -334 +334 @@
 == Changelog ==
 
+= 2.8.???????????????????????????????? =
+* FIXED
+    * Warning message. PHP Deprecated: pathinfo(): Passing null to parameter #1 (https://wordpress.org/support/topic/passing-null-to-string-warning/)
+    * Warning message. Trying to get property 'comment_ID' of non-object (https://wordpress.org/support/topic/comment_id-error/).
+
 = 2.8.36 =
 * FIXED
@@ -343 +348 @@
     * Warnings about global comment variable in comment highlighting.
     * Minified min.js files.
+
 = 2.8.34 =
 * ADDED