Changeset 11377

Timestamp:

Jun 14, 2011, 8:29:09 PM (13 years ago)

Author:

mistic100

Message:

remove SmiliesSupport version test, allow 3 chars hexadecimal colors

Location:

extensions/bbcode_bar

Files:

• bbcode_bar.inc.php (modified) (4 diffs)
• main.inc.php (modified) (1 diff)

extensions/bbcode_bar/bbcode_bar.inc.php

@@ -36 +36 @@
 
   // smilies support > 2.2.f ## must be parsed after bbcode_bar, because the javascript must be after bbc's one
-  if (isset($pwg_loaded_plugins['SmiliesSupport']) AND strcmp($pwg_loaded_plugins['SmiliesSupport']['version'], '2.2.f') != -1) {
+  if (isset($pwg_loaded_plugins['SmiliesSupport'])) 
+  {
     set_smiliessupport();
   }  
@@ -189 +190 @@
   {
     //Images
-    $patterns[] = "#\[img\](.*?)\[/img\]#si";
+    $patterns[] = "#\[img\](.*?)\[/img\]#is";
     $replacements[] = '<img src="\\1" />';
   }
@@ -227 +228 @@
   {
     //Size
-    $patterns[] = "#\[size=([1-2]?[0-9])\](.*?)\[/size\]#si";
+    $patterns[] = "#\[size=([1-2]?[0-9])\](.*?)\[/size\]#is";
     $replacements[] = '<span style="font-size: \\1px; line-height: normal">\\2</span>';
   }
@@ -233 +234 @@
   {
     //Colours
-    $patterns[] = "#\[color=(\#[0-9A-F]{6}|[a-z]+)\](.*?)\[/color\]#si";
+    $patterns[] = "#\[color=(\#[0-9A-F]{6}|\#[0-9A-F]{3}|[a-z]+)\](.*?)\[/color\]#is";
     $replacements[] = '<span style="color: \\1">\\2</span>';
   }

extensions/bbcode_bar/main.inc.php

@@ -44 +44 @@
     ));
     return $menu;
-  }
-  
-  // version 2.2.a or greater of SmiliesSupport is required
-  add_event_handler('loc_end_admin', 'bbcode_bar_check_smilies');
-  function bbcode_bar_check_smilies() 
-  {
-    global $page, $template, $pwg_loaded_plugins;
-
-    if (
-      ( (isset($_GET['page']) AND $_GET['page'] == 'plugins_list') OR (isset($_GET['section']) AND $_GET['section'] == 'bbcode_bar/admin.php') )
-      AND isset($pwg_loaded_plugins['SmiliesSupport']) AND strcmp($pwg_loaded_plugins['SmiliesSupport']['version'], '2.2.f') == -1
-    ) {
-      array_push($page['warnings'], "BBCode Bar : SmiliesSupport has been detected, but is not up to date. Version 2.2.a or greater is required. Please update.");
-      $template->assign('warnings', $page['warnings']);
-    }
-  }
-  
+  } 
 }