From dbeda84467ee04cc1d03cc4762f8a397f7b8a83c Mon Sep 17 00:00:00 2001
From: Tamara Temple <tamouse@gmail.com>
Date: Sat, 7 Apr 2012 13:26:18 -0500
Subject: [PATCH] make changes to sort languages

---
 sourceblock.php |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sourceblock.php b/sourceblock.php
index f5d086a..e67bcbe 100644
--- a/sourceblock.php
+++ b/sourceblock.php
@@ -23,8 +23,10 @@
  * SOFTWARE.
  *
  * See http://www.pmwiki.org/wiki/Cookbook/SourceBlock for info.
+ *
+ * Modifications based on my comments in http://www.pmwiki.org/wiki/Cookbook/SourceBlock-Talk - tamouse 2012-04-07
  */
-$RecipeInfo['SourceBlock']['Version'] = '2009-01-27';
+$RecipeInfo['SourceBlock']['Version'] = '2012-04-07';
 
 SDV($GESHI_PATH, dirname(__FILE__) . "/geshi");
 
@@ -240,9 +242,9 @@ Markup('sourceblockinfo', '<sourceblock',
 function SourceBlockGeshiInfos($pagename) {
   global $GESHI_PATH, $SourceBlockLangNames;
   include_once($GESHI_PATH . "/geshi.php");
-  $infos = array("Geshi Version: " . GESHI_VERSION);
+  $out = "Geshi Version: " . GESHI_VERSION; // save up output in $out instead of $infos array - tamouse
   if(IsEnabled($SourceBlockLangNames, 1))
-    $infos[] = "\n||border=1\n||! lang ||! full name ||";
+    $out .= "\n||border=1\n||! lang ||! full name ||\n"; // ditto; note extra \n - tamouse
   if($dh = opendir(GESHI_LANG_ROOT)) {
     while(($file = readdir($dh)) !== false) {
       if(preg_match("/\\.php$/", $file)) {
@@ -250,14 +252,15 @@ function SourceBlockGeshiInfos($pagename) {
         if(IsEnabled($SourceBlockLangNames, 1)) {
           $language_data = array();
           require GESHI_LANG_ROOT . $file;
-          $infos[] = "|| @@" . $lang . "@@ ||" . $language_data['LANG_NAME'] . " ||";
+          $infos[$lang] = "|| @@" . $lang . "@@ ||" . $language_data['LANG_NAME'] . " ||"; // use $lang as index - tamouse
         } else
-          $infos[] = "* @@" . $lang . "@@";
+          $infos[$lang] = "* @@" . $lang . "@@"; // ditto - tamouse
       }
     }
     closedir($dh);
   }
-  $out = implode("\n", $infos) . "\n";
+  ksort($infos); // sort the array - tamouse
+  $out .= implode("\n", $infos) . "\n"; // APPEND output, don't replace - tamouse
   return $out;
 }
 
-- 
1.7.1