re r64403 - remove never-actually-used $flag parameter from verifyUpload()

[lhc/web/wiklou.git] / includes / api / ApiQueryAllmessages.php

diff --git a/includes/api/ApiQueryAllmessages.php b/includes/api/ApiQueryAllmessages.php
index 4d021ba..6e5cbd2 100644 (file)
--- a/includes/api/ApiQueryAllmessages.php
+++ b/includes/api/ApiQueryAllmessages.php
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  */
 
@@ -48,6 +48,9 @@ class ApiQueryAllmessages extends ApiQueryBase {
                if ( !is_null( $params['lang'] ) && $params['lang'] != $wgLang->getCode() ) {
                        $oldLang = $wgLang; // Keep $wgLang for restore later
                        $wgLang = Language::factory( $params['lang'] );
+               } else if ( is_null( $params['lang'] ) ) {
+                       // Language not determined by URL but by user preferences, so don't cache
+                       $this->getMain()->setVaryCookie();
                }
 
                $prop = array_flip( (array)$params['prop'] );
@@ -75,7 +78,6 @@ class ApiQueryAllmessages extends ApiQueryBase {
                }
 
                // Get all requested messages and print the result
-               $messages = array();
                $skip = !is_null( $params['from'] );
                $result = $this->getResult();
                foreach ( $messages_target as $message ) {