Merge branch 'development' into 'master'

Development

See merge request xevidos/codiad!17

components/active/class.active.php

@@ -101,7 +101,7 @@ class Active extends Common {
 		foreach( $result as $id => $data ) {
 			
 			array_push( $users, $data["user"] );
-			if( $data["user"] == $_SESSION ) {
+			if( $data["user"] == $_SESSION["user"] ) {
 				
 				$user = true;
 				break;

components/sql/class.sql.php

@@ -218,6 +218,22 @@ class sql {
 				);
 			}
 			
+			try {
+				
+				$this->query( array(
+					"mysql" => "ALTER TABLE user_options DROP INDEX option_name;",
+					"pgsql" => "ALTER TABLE user_options DROP CONSTRAINT option_name;",
+				), array(), 0, "rowCount", "exception" );
+			} catch( Exception $error ) {
+				
+				//The access field is not there.
+				//echo var_export( $error->getMessage(), $access_query );
+				$status_updates["nameusername_user_option_constraint"] = array(
+					"error_message" => $error->getMessage(),
+					"dev_message" => "No constriant to remove."
+				);
+			}
+			
 			try {
 				
 				$update_query = array(
@@ -359,6 +375,21 @@ class sql {
 				);
 			}
 			
+			try {
+				
+				$projects = $this->query( array(
+					"mysql" => "ALTER TABLE projects DROP INDEX project_path;",
+					"pgsql" => "ALTER TABLE projects DROP CONSTRAINT project_path;",
+				), array(), 0, "rowCount", "exception" );
+			} catch( Exception $error ) {
+				
+				//echo var_dump( $error->getMessage() );
+				$status_updates["path_owner_constraint"] = array(
+					"error_message" => $error->getMessage(),
+					"dev_message" => "Removal of project_path constraint in the projects table failed.  This usually means there was never one to begin with"
+				);
+			}
+			
 			try {
 				
 				$convert = false;

components/update/class.update.php

@@ -12,7 +12,7 @@ class Update {
 	// CONSTANTS
 	//////////////////////////////////////////////////////////////////
 	
-	CONST VERSION = "v.3.0.0";
+	CONST VERSION = "v.3.0.1";
 	
 	//////////////////////////////////////////////////////////////////
 	// PROPERTIES