Merge "(bug 38556) Add header and footer messages to MediaWiki's info action"

[lhc/web/wiklou.git] / includes / db / DatabaseOracle.php

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 8ce6e70..cf3e45d 100644 (file)
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -810,7 +810,7 @@ class DatabaseOracle extends DatabaseBase {
        /**
         * Return aggregated value function call
         */
-       function aggregateValue ( $valuedata, $valuename = 'value' ) {
+       public function aggregateValue( $valuedata, $valuename = 'value' ) {
                return $valuedata;
        }
 
@@ -979,11 +979,6 @@ class DatabaseOracle extends DatabaseBase {
                }
        }
 
-       /* Not even sure why this is used in the main codebase... */
-       function limitResultForUpdate( $sql, $num ) {
-               return $sql;
-       }
-
        /* defines must comply with ^define\s*([^\s=]*)\s*=\s?'\{\$([^\}]*)\}'; */
        function sourceStream( $fp, $lineCallback = false, $resultCallback = false,
                $fname = 'DatabaseOracle::sourceStream', $inputCallback = false ) {