r45024 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r45023‎ | r45024 | r45025 >
Date:13:40, 25 December 2008
Author:ialex
Status:ok
Tags:
Comment:
PHP 5.3 really doesn't like Namespace:: :)
Modified paths:
  • /trunk/phase3/includes/specials/SpecialSearch.php (modified) (history)
  • /trunk/phase3/maintenance/FiveUpgrade.inc (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/FiveUpgrade.inc
@@ -888,17 +888,17 @@
889889 $add = array();
890890 while( $row = $this->dbr->fetchObject( $result ) ) {
891891 $add[] = array(
892 - 'wl_user' => $row->wl_user,
893 - 'wl_namespace' => Namespace::getSubject( $row->wl_namespace ),
894 - 'wl_title' => $this->conv( $row->wl_title ),
895 - 'wl_notificationtimestamp' => '0' );
 892+ 'wl_user' => $row->wl_user,
 893+ 'wl_namespace' => MWNamespace::getSubject( $row->wl_namespace ),
 894+ 'wl_title' => $this->conv( $row->wl_title ),
 895+ 'wl_notificationtimestamp' => '0' );
896896 $this->addChunk( $add );
897897
898898 $add[] = array(
899 - 'wl_user' => $row->wl_user,
900 - 'wl_namespace' => Namespace::getTalk( $row->wl_namespace ),
901 - 'wl_title' => $this->conv( $row->wl_title ),
902 - 'wl_notificationtimestamp' => '0' );
 899+ 'wl_user' => $row->wl_user,
 900+ 'wl_namespace' => MWNamespace::getTalk( $row->wl_namespace ),
 901+ 'wl_title' => $this->conv( $row->wl_title ),
 902+ 'wl_notificationtimestamp' => '0' );
903903 $this->addChunk( $add );
904904 }
905905 $this->lastChunk( $add );
Index: trunk/phase3/includes/specials/SpecialSearch.php
@@ -804,7 +804,7 @@
805805 $rows = array();
806806 $tables = "";
807807 foreach( $namespaces as $ns => $name ) {
808 - $subj = Namespace::getSubject( $ns );
 808+ $subj = MWNamespace::getSubject( $ns );
809809 if( !array_key_exists( $subj, $rows ) ) {
810810 $rows[$subj] = "";
811811 }
@@ -1379,7 +1379,7 @@
13801380 // many assumptions about namespace numbering
13811381 $rows = array();
13821382 foreach( $namespaces as $ns => $name ) {
1383 - $subj = Namespace::getSubject( $ns );
 1383+ $subj = MWNamespace::getSubject( $ns );
13841384 if( !array_key_exists( $subj, $rows ) ) {
13851385 $rows[$subj] = "";
13861386 }

Status & tagging log