Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/106504
Change subject: Resolve merge conflicts
......................................................................
Resolve merge conflicts
the seperation of math and mathoid table was not merged correctly
Change-Id: I0f154bb4d34b972b0aee36c5edbbd64c31e014fa
---
M MathRenderer.php
M MathTexvc.php
2 files changed, 13 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math
refs/changes/04/106504/1
diff --git a/MathRenderer.php b/MathRenderer.php
index c0d7b89..0d52263 100644
--- a/MathRenderer.php
+++ b/MathRenderer.php
@@ -289,26 +289,28 @@
global $wgMathDebug;
$this->inputHash = $rpage->math_inputhash; //MUST NOT BE NULL
$this->md5 = self::dbHash2md5($this->inputHash);
- if ( $rpage->math_mathml ){
+ if ( ! empty( $rpage->math_mathml ) ){
$this->mathml = utf8_decode ( $rpage->math_mathml );
}
- if ( $rpage->math_inputtex ) { //in the current database the
field is probably not set.
+ if ( ! empty( $rpage->math_inputtex ) ) { //in the current
database the field is probably not set.
$this->userInputTex = $rpage->math_inputtex;
}
- if ( $rpage->math_tex ) {
+ if ( ! empty( $rpage->math_tex ) ) {
$this->tex = $rpage->math_tex;
}
- if ( $rpage->math_svg ) {
+ if ( ! empty( $rpage->math_svg ) ) {
$this->svg = $rpage->math_svg;
}
if ( $wgMathDebug ) {
- if ( $rpage->math_status !== null){
+ if ( ! empty( $rpage->math_status ) ){
$this->statusCode = $rpage->math_status;
}
- if ( $rpage->math_log ){
+ if ( ! empty( $rpage->math_log ) ){
+ $this->timestamp = $rpage->math_log;
+ }
+ if ( ! empty( $rpage->math_timestamp ) ){
$this->log = $rpage->math_log;
}
- $this->timestamp = $rpage->math_timestamp;
if ( $this->userInputTex ){
if ( $this->md5 !== md5(
$this->getUserInputTex() )) {
wfDebugLog ( "Math", 'Hash in
the database does not match the hash of the user inputtext.');
diff --git a/MathTexvc.php b/MathTexvc.php
index e1d500e..407563e 100644
--- a/MathTexvc.php
+++ b/MathTexvc.php
@@ -27,7 +27,7 @@
const LIBERAL = 0;
const MW_TEXVC_SUCCESS = -1;
- /**
+ /**
* Gets an array that matches the variables of the class to the
database columns
* @return array
*/
@@ -47,15 +47,14 @@
return $out;
}
- public function dbInArray() {
+ protected function dbInArray() {
return array('math_inputhash','math_outputhash',
- 'math_html_conservativeness',
- 'math_html');
+ 'math_html_conservativeness','math_html');
}
/**
* @param database_row $rpage
*/
- function initializeFromDatabaseRow( $rpage ) {
+ protected function initializeFromDatabaseRow( $rpage ) {
$result = parent::initializeFromDatabaseRow($rpage);
//get deprecated fields
if ( $rpage->math_outputhash ){
--
To view, visit https://gerrit.wikimedia.org/r/106504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f154bb4d34b972b0aee36c5edbbd64c31e014fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: dev
Gerrit-Owner: Physikerwelt <w...@physikerwelt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
