Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13021
mediawiki-1.22.1-patch-60094.txt
Public
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Authored By
•
bzimport
Nov 22 2014, 2:56 AM
2014-11-22 02:56:58 (UTC+0)
Size
926 B
Referenced Files
None
Subscribers
None
mediawiki-1.22.1-patch-60094.txt
View Options
diff -cwr mediawiki-1.22.1-patched/includes/db/DatabasePostgres.php mediawiki-1.22.1/includes/db/DatabasePostgres.php
*** mediawiki-1.22.1-patched/includes/db/DatabasePostgres.php Wed Jan 15 18:24:22 2014
--- mediawiki-1.22.1/includes/db/DatabasePostgres.php Tue Jan 14 06:50:42 2014
***************
*** 729,735 ****
* so causes a DB error. This wrapper checks which tables can be locked and adjusts it accordingly.
*/
function selectSQLText( $table, $vars, $conds = '', $fname = __METHOD__, $options = array(), $join_conds = array() ) {
- if ( is_array($options) ) {
$forUpdateKey = array_search( 'FOR UPDATE', $options );
if ( $forUpdateKey !== false && $join_conds ) {
unset( $options[$forUpdateKey] );
--- 729,734 ----
***************
*** 740,746 ****
}
}
}
- }
return parent::selectSQLText( $table, $vars, $conds, $fname, $options, $join_conds );
}
--- 739,744 ----
File Metadata
Details
Attached
Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
12462
Default Alt Text
mediawiki-1.22.1-patch-60094.txt (926 B)
Attached To
Mode
T62094: rebuildall.php fails with PostgreSQL with PHP error "Cannot unset string offsets in /home/apache/htdocs/mediawiki/TOmig2/includes/db/DatabasePostgres.php on line 734"
Attached
Detach File
Event Timeline
Log In to Comment