Merge pull request #27 from WildcardSearch/maintenance

2.1.2 Release

Author: Mark Vincent

README.md

@@ -1,4 +1,4 @@
-## Puppet Master 2.1.1
+## Puppet Master 2.1.2
 for MyBB 1.8.x
 
 <p align="center">

Upload/inc/plugins/puppet_master.php

@@ -12,7 +12,7 @@
 	die('Direct initialization of this file is not allowed.<br /><br />Please make sure IN_MYBB is defined.');
 }
 
-define('PUPPET_MASTER_VERSION', '2.1.1');
+define('PUPPET_MASTER_VERSION', '2.1.2');
 
 // register custom class autoloader
 spl_autoload_register('puppetMasterClassAutoload');

Upload/inc/plugins/puppet_master/acp.php

@@ -262,7 +262,7 @@ function puppet_master_admin_edit()
 				// add it
 				$this_puppet = array (
 					"uid" => $uid,
-					"username" => $puppet_user['username'],
+					"username" => $db->escape_string($puppet_user['username']),
 					"ownerid" => $ownerid,
 					"disp_order" => $disp_order
 				);