| Index: branches/REL1_18/extensions/LiquidThreads/classes/View.php |
| — | — | @@ -359,7 +359,7 @@ |
| 360 | 360 | * @param $request FauxRequest object to have session data injected into. |
| 361 | 361 | */ |
| 362 | 362 | static function fixFauxRequestSession( $request ) { |
| 363 | | - foreach( $_SESSION as $k => $v ) { |
| | 363 | + foreach( (array)$_SESSION as $k => $v ) { |
| 364 | 364 | $request->setSessionData( $k, $v ); |
| 365 | 365 | } |
| 366 | 366 | } |
| Property changes on: branches/REL1_18/extensions/LiquidThreads |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 367 | 367 | Merged /trunk/extensions/LiquidThreads:r103675,104049,104162 |
| Index: branches/REL1_18/extensions/CentralAuth/specials/SpecialGlobalUsers.php |
| — | — | @@ -9,7 +9,7 @@ |
| 10 | 10 | global $wgOut, $wgRequest, $wgContLang; |
| 11 | 11 | $this->setHeaders(); |
| 12 | 12 | |
| 13 | | - $pg = new GlobalUsersPager(); |
| | 13 | + $pg = new GlobalUsersPager( $this->getContext(), $par ); |
| 14 | 14 | |
| 15 | 15 | if ( $par ) { |
| 16 | 16 | $pg->setGroup( $par ); |
| — | — | @@ -33,8 +33,8 @@ |
| 34 | 34 | class GlobalUsersPager extends UsersPager { |
| 35 | 35 | protected $requestedGroup = false, $requestedUser; |
| 36 | 36 | |
| 37 | | - function __construct() { |
| 38 | | - parent::__construct(); |
| | 37 | + function __construct( IContextSource $context = null, $par = null ) { |
| | 38 | + parent::__construct( $context, $par ); |
| 39 | 39 | $this->mDb = CentralAuthUser::getCentralSlaveDB(); |
| 40 | 40 | } |
| 41 | 41 | |
| Property changes on: branches/REL1_18/extensions/CentralAuth |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 42 | 42 | Merged /trunk/extensions/CentralAuth:r100516,103675,104049,104162 |
| Index: branches/REL1_18/extensions/GlobalUsage/GlobalUsageHooks.php |
| — | — | @@ -17,7 +17,19 @@ |
| 18 | 18 | |
| 19 | 19 | // Create a list of locally existing images |
| 20 | 20 | $images = array_keys( $linksUpdater->getImages() ); |
| 21 | | - $localFiles = array_keys( RepoGroup::singleton()->getLocalRepo()->findFiles( $images ) ); |
| | 21 | + |
| | 22 | + //$localFiles = array_keys( RepoGroup::singleton()->getLocalRepo()->findFiles( $images ) ); |
| | 23 | + // Unrolling findFiles() here because pages with thousands of images trigger an OOM |
| | 24 | + // error while building an array with thousands of File objects (bug 32598) |
| | 25 | + $localFiles = array(); |
| | 26 | + $repo = RepoGroup::singleton()->getLocalRepo(); |
| | 27 | + foreach ( $images as $image ) { |
| | 28 | + $file = $repo->findFile( $image ); |
| | 29 | + if ( $file ) { |
| | 30 | + $localFiles[] = $file->getTitle()->getDBkey(); |
| | 31 | + } |
| | 32 | + } |
| | 33 | + |
| 22 | 34 | $missingFiles = array_diff( $images, $localFiles ); |
| 23 | 35 | |
| 24 | 36 | global $wgUseDumbLinkUpdate; |
| Index: branches/REL1_18/extensions/GlobalUsage/GlobalUsage_body.php |
| — | — | @@ -112,7 +112,7 @@ |
| 113 | 113 | 'gil_to' => $row->il_to, |
| 114 | 114 | ); |
| 115 | 115 | } |
| 116 | | - $this->db->insert( 'globalimagelinks', $insert, __METHOD__ ); |
| | 116 | + $this->db->insert( 'globalimagelinks', $insert, __METHOD__, array( 'IGNORE' ) ); |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | /** |
| Property changes on: branches/REL1_18/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 120 | 120 | Merged /trunk/extensions:r100516,103675,104049,104162 |