Merge branch 'master' of git+ssh://git.sihnon.net/home/git/public/handbrake-cluster-webui

RippingCluster_LogEntry overwrote base class field list, causing
undefined index notices when the base class was explicitly used.

source/lib/RippingCluster/LogEntry.class.php

@@ -4,8 +4,16 @@ class RippingCluster_LogEntry extends SihnonFramework_LogEntry {
     
     protected $job_id;
     
+    protected static $types;
+    
     public static function initialise() {
-        self::$types['job_id'] = 'int'; 
+    	// Copy the list of datatypes from the parent
+    	// We can't modify it in place, else we'll break any logging done inside the SihnonFramework tree
+    	// or other subclass trees.
+    	static::$types = parent::$types;
+    	
+    	// Add the new data types for this subclass
+        static::$types['job_id'] = 'int'; 
     }
 
     protected function __construct($level, $category, $ctime, $pid, $file, $line, $message, $job_id) {

webui/_inc.php

@@ -1,9 +1,9 @@
 <?php
 
 require_once '/etc/ripping-cluster/config.php';
-require_once RippingCluster_Lib . 'RippingCluster/Main.class.php';
+require_once SihnonFramework_Lib . 'SihnonFramework/Main.class.php';
 
-RippingCluster_Main::registerAutoloadClasses('SihnonFramework', SihnonFramework_Lib,
+SihnonFramework_Main::registerAutoloadClasses('SihnonFramework', SihnonFramework_Lib,
 												'RippingCluster', RippingCluster_Lib);
 
 ?>