remove inverse_timestamp wherever it is found and disable wfInvertTimestamp()

[lhc/web/wiklou.git] / includes / Group.php

diff --git a/includes/Group.php b/includes/Group.php
index 6c02ecd..1502eab 100644 (file)
--- a/includes/Group.php
+++ b/includes/Group.php
@@ -5,6 +5,7 @@
 
 /**
  * Class to manage a group
+ * @package MediaWiki
  */
 class Group {
        /**#@+
@@ -20,7 +21,7 @@ class Group {
        var $dataLoaded;
        /** string $rights Contain rights values : "foo,bar,bla" */
        var $rights;
-       /**#@- */
+       /**#@-*/
        
        /** Constructor */
        function Group() {
@@ -49,7 +50,7 @@ class Group {
                
                if($this->id) {
                        $dbr =& wfGetDB( DB_SLAVE );
-                       $r = $dbr->selectRow('`group`', array('group_id', 'group_name', 'group_description', 'group_rights'), array( 'group_id' => $this->id ), $fname );
+                       $r = $dbr->selectRow('group', array('group_id', 'group_name', 'group_description', 'group_rights'), array( 'group_id' => $this->id ), $fname );
                        $this->id = $r->group_id;
                        $this->name = $r->group_name;
                        $this->description = $r->group_description;
@@ -57,7 +58,7 @@ class Group {
                        $this->dataLoaded = true;
                } else {
                        $dbr =& wfGetDB( DB_SLAVE );
-                       $r = $dbr->selectRow('`group`', array('group_id', 'group_name', 'group_description', 'group_rights'), array( 'group_name' => $this->name ), $fname );
+                       $r = $dbr->selectRow('group', array('group_id', 'group_name', 'group_description', 'group_rights'), array( 'group_name' => $this->name ), $fname );
                        $this->id = $r->group_id;
                        $this->name = $r->group_name;
                        $this->description = $r->group_description;
@@ -70,7 +71,7 @@ class Group {
        function addToDatabase() {
                $fname = 'Group::addToDatabase';
                $dbw =& wfGetDB( DB_MASTER );
-               $dbw->insert( '`group`',
+               $dbw->insert( 'group',
                        array(
                                'group_name' => $this->name,
                                'group_description' => $this->description,
@@ -87,7 +88,7 @@ class Group {
 
                $dbw =& wfGetDB( DB_MASTER );
                
-               $dbw->update( '`group`',
+               $dbw->update( 'group',
                        array( /* SET */
                                'group_name' => $this->name,
                                'group_description' => $this->description,
@@ -131,8 +132,9 @@ class Group {
        function nameFromId($id) {
                $fname = 'Group::nameFromId';
                $dbr =& wfGetDB( DB_SLAVE );
-               $r = $dbr->selectRow( '`group`', array( 'group_name' ), array( 'group_id' => $id ), $fname );
-               
+               $r = $dbr->selectRow( 'group', array( 'group_name' ), array( 'group_id' => $id ), $fname );
+               if ($dbr == null)
+                       return;         
                if($r === false) {
                        return '';
                } else {
@@ -147,7 +149,7 @@ class Group {
        function idFromName($name) {
                $fname = 'Group::idFromName';
                $dbr =& wfGetDB( DB_SLAVE );
-               $r = $dbr->selectRow( '`group`', array( 'group_id' ), array( 'group_name' => $name ), $fname );
+               $r = $dbr->selectRow( 'group', array( 'group_id' ), array( 'group_name' => $name ), $fname );
 
                if($r === false) {
                        return 0;
@@ -184,4 +186,4 @@ class Group {
                $this->rights = $rights;
        }
 }
-?>
+?>
\ No newline at end of file