r114058 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r114057‎ | r114058 | r114059 >
Date:17:22, 17 March 2012
Author:reedy
Status:resolved
Tags:
Comment:
MFT x2 r114057
Modified paths:
  • /branches/REL1_18/extensions/LiquidThreads (modified) (history)
  • /branches/REL1_18/extensions/LiquidThreads/classes/Hooks.php (modified) (history)
  • /branches/REL1_19/extensions/LiquidThreads (modified) (history)
  • /branches/REL1_19/extensions/LiquidThreads/classes/Hooks.php (modified) (history)

Diff [purge]

Index: branches/REL1_18/extensions/LiquidThreads/classes/Hooks.php
@@ -309,12 +309,11 @@
310310 }
311311
312312 public static function onLoadExtensionSchemaUpdates( $updater = null ) {
313 - $dir = realpath( dirname( __FILE__ ) . '/..' );
 313+ $dir = dirname( __FILE__ );
314314
315315 if ( $updater === null ) {
316316 // DB updates
317317 $wgExtNewTables[] = array( 'thread', "$dir/lqt.sql" );
318 - $wgExtNewTables[] = array( 'user_message_state', "$dir/lqt.sql" );
319318 $wgExtNewTables[] = array( 'thread_history', "$dir/schema-changes/thread_history_table.sql" );
320319 $wgExtNewTables[] = array( 'thread_pending_relationship', "$dir/schema-changes/thread_pending_relationship.sql" );
321320 $wgExtNewTables[] = array( 'thread_reaction', "$dir/schema-changes/thread_reactions.sql" );
@@ -338,7 +337,6 @@
339338 $wgExtNewIndexes[] = array( 'thread', 'thread_summary_page', '(thread_summary_page)' );
340339 } else {
341340 $updater->addExtensionUpdate( array( 'addTable', 'thread', "$dir/lqt.sql", true ) );
342 - $updater->addExtensionUpdate( array( 'addTable', 'user_message_state', "$dir/lqt.sql", true ) );
343341 $updater->addExtensionUpdate( array( 'addTable', 'thread_history', "$dir/schema-changes/thread_history_table.sql", true ) );
344342 $updater->addExtensionUpdate( array( 'addTable', 'thread_pending_relationship', "$dir/schema-changes/thread_pending_relationship.sql", true ) );
345343 $updater->addExtensionUpdate( array( 'addTable', 'thread_reaction', "$dir/schema-changes/thread_reactions.sql", true ) );
Property changes on: branches/REL1_18/extensions/LiquidThreads
___________________________________________________________________
Modified: svn:mergeinfo
346344 Merged /trunk/extensions/LiquidThreads:r114057
Index: branches/REL1_19/extensions/LiquidThreads/classes/Hooks.php
@@ -338,10 +338,9 @@
339339 * @return bool
340340 */
341341 public static function onLoadExtensionSchemaUpdates( $updater = null ) {
342 - $dir = realpath( dirname( __FILE__ ) . '/..' );
 342+ $dir = dirname( __FILE__ );
343343
344344 $updater->addExtensionUpdate( array( 'addTable', 'thread', "$dir/lqt.sql", true ) );
345 - $updater->addExtensionUpdate( array( 'addTable', 'user_message_state', "$dir/lqt.sql", true ) );
346345 $updater->addExtensionUpdate( array( 'addTable', 'thread_history', "$dir/schema-changes/thread_history_table.sql", true ) );
347346 $updater->addExtensionUpdate( array( 'addTable', 'thread_pending_relationship', "$dir/schema-changes/thread_pending_relationship.sql", true ) );
348347 $updater->addExtensionUpdate( array( 'addTable', 'thread_reaction', "$dir/schema-changes/thread_reactions.sql", true ) );
Property changes on: branches/REL1_19/extensions/LiquidThreads
___________________________________________________________________
Modified: svn:mergeinfo
349348 Merged /trunk/extensions/LiquidThreads:r114057

Follow-up revisions

RevisionCommit summaryAuthorDate
r114138Partial revert r114058reedy14:14, 19 March 2012
r114139MFT r114138...reedy14:19, 19 March 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r114057Use more normal $dir code, remove duplicate loading of same file as it's goin...reedy17:19, 17 March 2012

Status & tagging log