Revert "Revert "merge""

This reverts commit 9294f72adb.
2013-08-03 00:18:14 +02:00
parent 9294f72adb
commit f09ac4e597
119 changed files with 1506 additions and 1508 deletions
@@ -43,7 +43,7 @@ require_once('include/taxonomy.php');
 define ( 'RED_PLATFORM',            'Red Matrix' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'R');
 define ( 'ZOT_REVISION',            1     ); 
-define ( 'DB_UPDATE_VERSION',       1054  );
+define ( 'DB_UPDATE_VERSION',       1057  );

 define ( 'EOL',                    '<br />' . "\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -785,8 +785,8 @@ class App {
 		return $this->path;
 	}

-	function set_account($aid) {
-		$this->account = $aid;
+	function set_account($acct) {
+		$this->account = $acct;
 	}

 	function get_account() {