Merge branch 'master' of gitorious.org:owncloud/owncloud

4 files changed, 11 insertions, 6 deletions

diff --git a/lib/app.php b/lib/app.php
index 13c4cef32b4..de7d82ce959 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -385,6 +385,7 @@ class OC_App{
 				$currentVersion=$appInfo['version'];
 				if (version_compare($currentVersion, $installedVersion, '>')) {
 					OC_App::updateApp($app);
+					OC_Appconfig::setValue($app,'installed_version',$appInfo['version']);
 				}
 			}
 		}
diff --git a/lib/base.php b/lib/base.php
index 854b91b0c1d..e0f14b703dc 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -178,7 +178,7 @@ class OC{
 
 		// Add the stuff we need always
 		OC_Util::addScript( "jquery-1.6.4.min" );
-		OC_Util::addScript( "jquery-ui-1.8.14.custom.min" );
+		OC_Util::addScript( "jquery-ui-1.8.16.custom.min" );
 		OC_Util::addScript( "jquery-showpassword" );
 		OC_Util::addScript( "jquery.infieldlabel.min" );
 		OC_Util::addScript( "jquery-tipsy" );
@@ -187,7 +187,7 @@ class OC{
 		OC_Util::addScript('search','result');
 		OC_Util::addStyle( "styles" );
 		OC_Util::addStyle( "multiselect" );
-		OC_Util::addStyle( "jquery-ui-1.8.14.custom" );
+		OC_Util::addStyle( "jquery-ui-1.8.16.custom" );
 		OC_Util::addStyle( "jquery-tipsy" );
 
 		$errors=OC_Util::checkServer();
diff --git a/lib/image.php b/lib/image.php
index 45b6ad3918d..bdfa1fefd7d 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -200,6 +200,7 @@ class OC_Image {
 	}
 
 	/**
+	* (I'm open for suggestions on better method name ;)
 	* @brief Fixes orientation based on EXIF data.
 	* @returns bool.
 	*/
diff --git a/lib/setup.php b/lib/setup.php
index ebe7a45a1f6..ce7ee24e134 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -84,7 +84,7 @@ class OC_Setup {
 				$dbpass = $options['dbpass'];
 				$dbname = $options['dbname'];
 				$dbhost = $options['dbhost'];
-				$dbtableprefix = $options['dbtableprefix'];
+				$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
 				OC_Config::setValue('dbname', $dbname);
 				OC_Config::setValue('dbhost', $dbhost);
 				OC_Config::setValue('dbtableprefix', $dbtableprefix);
@@ -190,9 +190,12 @@ class OC_Setup {
 					}
 
 					//fill the database if needed
-					$query = "SELECT relname FROM pg_class WHERE relname='{$dbtableprefix}users' limit 1";
+					$query = "select count(*) FROM pg_class WHERE relname='{$dbtableprefix}users' limit 1";
 					$result = pg_query($connection, $query);
-					if(!$result) {
+					if($result){
+						$row = pg_fetch_row($result);
+					}
+					if(!$result or $row[0]==0) {
 						OC_DB::createDbFromStructure('db_structure.xml');
 					}
 					pg_close($connection);
@@ -285,7 +288,7 @@ class OC_Setup {
 		$content.= "php_value post_max_size 512M\n";
 		$content.= "SetEnv htaccessWorking true\n";
 		$content.= "</IfModule>\n";
-		$content.= "<IfModule mod_rewrite.c>";
+		$content.= "<IfModule mod_rewrite.c>\n";
 		$content.= "RewriteEngine on\n";
 		$content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]\n";
 		$content.= "</IfModule>\n";