Merge "Removed $wgImgAuthPublicTest"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 22 Apr 2014 20:59:02 +0000 (20:59 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 22 Apr 2014 20:59:02 +0000 (20:59 +0000)
1  2 
img_auth.php
includes/DefaultSettings.php

diff --cc img_auth.php
@@@ -50,13 -48,9 +48,13 @@@ $wgActionPaths = array( "$wgUploadPath/
  
  wfImageAuthMain();
  wfLogProfilingData();
 +// Commit and close up!
 +$factory = wfGetLBFactory();
 +$factory->commitMasterChanges();
 +$factory->shutdown();
  
  function wfImageAuthMain() {
-       global $wgImgAuthPublicTest, $wgImgAuthUrlPathMap;
+       global $wgImgAuthUrlPathMap;
  
        $request = RequestContext::getMain()->getRequest();
        $publicWiki = in_array( 'read', User::getGroupPermissions( array( '*' ) ), true );
Simple merge