Mercurial > public > src > phphgadmin

diff admin/application/libraries/hgphp.php @ 28:4543c151a667

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added additional configuration options. Fixed last possible concurrency error, removing a single hgweb.config.lock with per-save temporary files.
author joshjcarrier
date Sun, 16 May 2010 13:50:22 -0700
parents 26ff1899349f
children 2cf4300b3541
line wrap: on
line diff
--- a/admin/application/libraries/hgphp.php	Sun May 16 12:49:58 2010 -0700
+++ b/admin/application/libraries/hgphp.php	Sun May 16 13:50:22 2010 -0700
@@ -21,12 +21,17 @@
 	
 	function __construct($config = array())
 	{
+		$this->_ci =& get_instance();
 		if(!empty($config))
 		{
 			$this->initialize($config);
 		}
+		else
+		{
+			$this->_ci->config->load('hgphp', TRUE);
+			$this->initialize($this->_ci->config->item('hgphp'));
+		}
 		
-		$this->_ci =& get_instance();
 		$this->_ci->lang->load('hgphp');
 		$this->_ci->load->library('hgconf2ini');
         log_message('debug', 'HgPHP class Initialized');