From 63b1ead363cdc128eefdf064383485a79c4fda0c Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Tue, 11 Sep 2012 13:56:48 -0400
Subject: [PATCH] Undefined index error fixed by returning a default error if
 none is set in the database.

---
 airtime_mvc/application/models/Datatables.php | 5 ++---
 airtime_mvc/application/models/Preference.php | 9 ++++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/models/Datatables.php b/airtime_mvc/application/models/Datatables.php
index a58a1fdb1..6560925de 100644
--- a/airtime_mvc/application/models/Datatables.php
+++ b/airtime_mvc/application/models/Datatables.php
@@ -73,13 +73,12 @@ class Application_Model_Datatables
                 $orig2searchTerm[$index] = $d;
             }
         }
-        // map that maps current column position to original position
-        $current2orig = $librarySetting['ColReorder'];
 
         // map that maps dbname to searchTerm
         $dbname2searchTerm = array();
         foreach ($current2dbname as $currentPos=>$dbname) {
-            $dbname2searchTerm[$dbname] = $orig2searchTerm[$current2orig[$currentPos]];
+            $dbname2searchTerm[$dbname] = 
+                $orig2searchTerm[$librarySetting($currentPos)];
         }
 
         $where = array();
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index d157bc9bf..44baf5575 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -1130,6 +1130,13 @@ class Application_Model_Preference
 
     public static function getCurrentLibraryTableSetting()
     {
-        return unserialize(self::getValue("library_datatable"));
+        $v = self::getValue("library_datatable");
+        if( $v === '' ) {
+            return function ($x) { return $x; };
+        } else {
+            $ds = unserialize($v);
+            return function ($x) use ($ds) { return $ds['ColReorder'][$x]; } ;
+        }
+        //return unserialize(self::getValue("library_datatable"));
     }
 }