Merge pull request #86 from DanielnetoDotCom/master

update unstable
WWBN · May 26, 2018 · 27c0b1a · 27c0b1a
2 parents f0f0d2d + e80ce77
commit 27c0b1a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/plugin/Live/Objects/LiveTransmition.php b/plugin/Live/Objects/LiveTransmition.php
@@ -136,7 +136,7 @@ static function getFromDbByUserName($userName) {
         global $global;
         $userName = $global['mysqli']->real_escape_string($userName);
         $sql = "SELECT * FROM users WHERE user = ? LIMIT 1";
-        $res = sqlDAL::readSql($sql,"s",array($userName)); 
+        $res = sqlDAL::readSql($sql,"s",array($userName), true); 
         $data = sqlDAL::fetchAssoc($res);
         sqlDAL::close($res);
         if ($res!=false) {

diff --git a/view/managerUsers.php b/view/managerUsers.php
@@ -198,7 +198,7 @@
                         for (var index in row.groups) {
                             $('#userGroup' + row.groups[index].id).prop('checked', true);
                         }
-                        $('#isAdmin').prop('checked', (row.isAdmin === "1" ? true : false));
+                        $('#isAdmin').prop('checked', (row.isAdmin == "1" ? true : false));
                         $('#canStream').prop('checked', (row.canStream === "1" ? true : false));
                         $('#canUpload').prop('checked', (row.canUpload === "1" ? true : false));
                         $('#status').prop('checked', (row.status === "a" ? true : false));

diff --git a/view/videoComments.php b/view/videoComments.php
@@ -66,7 +66,7 @@
                 <i class="fa fa-trash" aria-hidden="true"></i>
             </button> 
             <button class="btn btn-default no-outline btn-xs pull-right edit userCanAdminComment"> 
-                <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
+                <i class="fas fa-edit" aria-hidden="true"></i>
             </button> 
         </div>
         <div style="padding-left: 50px;">