[geshi-cvs] geshi-src class.geshi.php,1.36,1.37

[Nigel M. <ora...@us...>]

Update of /cvsroot/geshi/geshi-src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28031

Modified Files:
	class.geshi.php 
Log Message:
Bug 61: add support for subthemes. All that needed to change was the detecting of subthemes in themesSupportedBy().

Index: class.geshi.php
===================================================================
RCS file: /cvsroot/geshi/geshi-src/class.geshi.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** class.geshi.php	2 Jan 2006 22:17:13 -0000	1.36
--- class.geshi.php	11 Jan 2006 09:33:40 -0000	1.37
***************
*** 558,565 ****
          $dh = opendir(GESHI_THEMES_ROOT);
          while (false !== ($theme_folder = readdir($dh))) {
!             if ('.' == $theme_folder || '..' == $theme_folder || !is_dir(GESHI_THEMES_ROOT . $theme_folder)) continue;
              if (is_readable(GESHI_THEMES_ROOT . $theme_folder
                  . GESHI_DIR_SEP . $language . '.php')) {
                  $themes[] = $theme_folder;
              }
          }
--- 558,576 ----
          $dh = opendir(GESHI_THEMES_ROOT);
          while (false !== ($theme_folder = readdir($dh))) {
!             if ('.' == $theme_folder || '..' == $theme_folder) continue;
              if (is_readable(GESHI_THEMES_ROOT . $theme_folder
                  . GESHI_DIR_SEP . $language . '.php')) {
                  $themes[] = $theme_folder;
+                 
+                 // Check for subthemes
+                 $dh2 = opendir(GESHI_THEMES_ROOT . $theme_folder);
+                 while (false !== ($subtheme_folder = readdir($dh2))) {
+                     if ('.' == $subtheme_folder || '..' == $subtheme_folder
+                         || !is_dir(GESHI_THEMES_ROOT . $theme_folder . GESHI_DIR_SEP . $subtheme_folder)) continue;
+                     if (is_readable(GESHI_THEMES_ROOT . $theme_folder . GESHI_DIR_SEP . $subtheme_folder
+                         . GESHI_DIR_SEP . $language . '.php')) {
+                         $themes[] = "$theme_folder/$subtheme_folder";
+                     }
+                 }
              }
          }