From 8186aba0250c4c848b9eac998431644e0bf75234 Mon Sep 17 00:00:00 2001 From: Magnus Manske Date: Sat, 14 May 2005 11:49:11 +0000 Subject: [PATCH] Validation database prefix fix --- includes/SkinTemplate.php | 4 ++-- includes/SpecialValidate.php | 27 ++++++++++++++++----------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index 936adc6aea..04c98033de 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -518,7 +518,7 @@ class SkinTemplate extends Skin { * @access private */ function buildContentActionUrls () { - global $wgContLang, $wgUseValidation; + global $wgContLang, $wgUseValidation, $wgDBprefix; $fname = 'SkinTemplate::buildContentActionUrls'; wfProfileIn( $fname ); @@ -649,7 +649,7 @@ class SkinTemplate extends Skin { {# Trying to get the current article revision through this weird stunt $tid = $this->mTitle->getArticleID(); $tns = $this->mTitle->getNamespace(); - $sql = "SELECT page_latest FROM page WHERE page_id={$tid} AND page_namespace={$tns}" ; + $sql = "SELECT page_latest FROM {$wgDBprefix}page WHERE page_id={$tid} AND page_namespace={$tns}" ; $res = wfQuery( $sql, DB_READ ); if( $s = wfFetchObject( $res ) ) $oid = $s->page_latest ; diff --git a/includes/SpecialValidate.php b/includes/SpecialValidate.php index 372f89f3ea..b73ae6438b 100644 --- a/includes/SpecialValidate.php +++ b/includes/SpecialValidate.php @@ -36,9 +36,10 @@ class Validation { # Reads all revision information of the specified article function prepareRevisions ( $id ) { + global $wgDBprefix ; $this->rev2date = array () ; $this->date2rev = array () ; - $sql = "SELECT * FROM revision WHERE rev_page='{$id}'" ; + $sql = "SELECT * FROM {$wgDBprefix}revision WHERE rev_page='{$id}'" ; $res = wfQuery( $sql, DB_READ ); while( $x = wfFetchObject( $res ) ) { $this->rev2date[$x->rev_id] = $x ; @@ -56,8 +57,9 @@ class Validation { # Returns an array containing all topics you can vote on function getTopicList () { + global $wgDBprefix ; $ret = array () ; - $sql = "SELECT * FROM validate WHERE val_user=0" ; + $sql = "SELECT * FROM {$wgDBprefix}validate WHERE val_user=0" ; $res = wfQuery( $sql, DB_READ ); while( $x = wfFetchObject( $res ) ) { $ret[$x->val_type] = $x ; @@ -126,12 +128,12 @@ class Validation { # Sets a specific revision to both cache and database function setRevision ( &$article , $revision , &$data ) { - global $wgUser ; + global $wgUser , $wgDBprefix ; $this->deleteRevision ( $article , $revision ) ; $this->voteCache[$this->getTimestamp($revision)] = $data ; foreach ( $data AS $x => $y ) { if ( $y->value > 0 ) { - $sql = "INSERT INTO validate (val_user,val_page,val_revision,val_type,val_value,val_comment) VALUES ('" ; + $sql = "INSERT INTO {$wgDBprefix}validate (val_user,val_page,val_revision,val_type,val_value,val_comment) VALUES ('" ; $sql .= $wgUser->getID() . "','" ; $sql .= $article->getID() . "','" ; $sql .= $revision . "','" ; @@ -145,10 +147,10 @@ class Validation { # Deletes a specific vote set in both cache and database function deleteRevision ( &$article , $revision ) { - global $wgUser ; + global $wgUser , $wgDBprefix ; $ts = $this->getTimestamp ( $revision ) ; if ( !isset ( $this->voteCache[$ts] ) ) return ; # Nothing to do - $sql = "DELETE FROM validate WHERE val_user='" . $wgUser->GetID() . "' AND " ; + $sql = "DELETE FROM {$wgDBprefix}validate WHERE val_user='" . $wgUser->GetID() . "' AND " ; $sql .= " val_page='" . $article->getID() . "' AND val_revision='{$revision}'" ; $res = wfQuery( $sql, DB_WRITE ); unset ( $this->voteCache[$ts] ) ; @@ -156,9 +158,9 @@ class Validation { # Reads the entire vote list for this user for the given article function getVoteList ( $id ) { - global $wgUser ; + global $wgUser , $wgDBprefix ; $r = array () ; # Revisions - $sql = "SELECT * FROM validate WHERE val_page=" . $id . " AND val_user=" . $wgUser->getID() ; + $sql = "SELECT * FROM {$wgDBprefix}validate WHERE val_page=" . $id . " AND val_user=" . $wgUser->getID() ; $res = wfQuery( $sql, DB_READ ); while( $x = wfFetchObject( $res ) ) { #$y = $x->val_revision ; @@ -173,9 +175,10 @@ class Validation { # This functions adds a topic to the database function addTopic ( $topic , $limit ) { + global $wgDBprefix ; $a = 1 ; while ( isset ( $this->topicList[$a] ) ) $a++ ; - $sql = "INSERT INTO validate (val_user,val_page,val_revision,val_type,val_value,val_comment) VALUES (" ; + $sql = "INSERT INTO {$wgDBprefix}validate (val_user,val_page,val_revision,val_type,val_value,val_comment) VALUES (" ; $sql .= "'0','0','0','{$a}','{$limit}','" ; $sql .= Database::strencode ( $topic ) . "')" ; $res = wfQuery( $sql, DB_WRITE ); @@ -189,7 +192,8 @@ class Validation { # This functions adds a topic to the database function deleteTopic ( $id ) { - $sql = "DELETE FROM validate WHERE val_type='{$id}'" ; + global $wgDBprefix ; + $sql = "DELETE FROM {$wgDBprefix}validate WHERE val_type='{$id}'" ; $res = wfQuery( $sql, DB_WRITE ); unset ( $this->topicList[$id] ) ; } @@ -393,12 +397,13 @@ class Validation { } function showList ( &$article ) { + global $wgDBprefix ; $this->prepareRevisions ( $article->getID() ) ; $this->topicList = $this->getTopicList() ; # Collecting statistic data $id = $article->getID() ; - $sql = "SELECT * FROM validate WHERE val_page='{$id}'" ; + $sql = "SELECT * FROM {$wgDBprefix}validate WHERE val_page='{$id}'" ; $res = wfQuery( $sql, DB_READ ); $data = array () ; while( $x = wfFetchObject( $res ) ) { -- 2.20.1