From: Michael Vogel <icarus@dabo.de>
Date: Wed, 1 Aug 2012 22:21:14 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=04c31d194f07e3b7a39ab7c8d5690da840c11fb7;p=friendica.git

Merge remote branch 'upstream/master'

Conflicts:
	update.php
---

04c31d194f07e3b7a39ab7c8d5690da840c11fb7
diff --cc update.php
index f98fb3ae71,9442f825bb..19e6cf3bdf
--- a/update.php
+++ b/update.php
@@@ -1336,3 -1336,11 +1336,10 @@@ function update_1152() 
  		return UPDATE_FAILED;
  	return UPDATE_SUCCESS;
  }
+ 
+ function update_1153() {
+ 	$r = q("ALTER TABLE `hook` ADD `priority` INT(11) UNSIGNED NOT NULL DEFAULT '0'");
+ 	
+ 	if(!$r) return UPDATE_FAILED;
+ 	return UPDATE_SUCCESS;
+ }
 -