Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '1.9.1' into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
This commit is contained in:
martin 2011-10-04 14:01:48 -04:00
commit cb3060623c
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
install_minimal/include/airtime-install.php
View file

@ -129,9 +129,9 @@ AirtimeInstall::InstallStorageDirectory();
if ($db_install) {
if($newInstall) {
// This is called with "system" so that we can pass in a parameter. See the file itself
// This is called with "passthru" so that we can pass in a parameter. See the file itself
// for why we need to do this.
system('php '.__DIR__.'/airtime-db-install.php y');
passthru('php '.__DIR__.'/airtime-db-install.php y');
AirtimeInstall::DbConnect(true);
} else {
require_once('airtime-db-install.php');