Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php
2015-05-28 19:06:31 -07:00
parent b381ec5734 df5223fe98
commit 8fe3daab21
10 changed files with 4443 additions and 2877 deletions
--- a/mod/impel.php
+++ b/mod/impel.php
@@ -113,6 +113,7 @@ function impel_init(&$a) {
 			dbesc($namespace),
 			intval(local_channel())
 		);
+
 		$i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1",
 			dbesc($arr['mid']),
 			intval(local_channel())