https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114058

Revision: 114058
Author:   reedy
Date:     2012-03-17 17:22:39 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
MFT x2 r114057

Modified Paths:
--------------
    branches/REL1_18/extensions/LiquidThreads/classes/Hooks.php
    branches/REL1_19/extensions/LiquidThreads/classes/Hooks.php

Property Changed:
----------------
    branches/REL1_18/extensions/LiquidThreads/
    branches/REL1_19/extensions/LiquidThreads/


Property changes on: branches/REL1_18/extensions/LiquidThreads
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk/extensions/LiquidThreads:57390,92706,97811,98773,98801,98960,98982,99022,99059,99097,99164,99167,103675,104049,104162
   + 
/trunk/extensions/LiquidThreads:57390,92706,97811,98773,98801,98960,98982,99022,99059,99097,99164,99167,103675,104049,104162,114057

Modified: branches/REL1_18/extensions/LiquidThreads/classes/Hooks.php
===================================================================
--- branches/REL1_18/extensions/LiquidThreads/classes/Hooks.php 2012-03-17 
17:19:18 UTC (rev 114057)
+++ branches/REL1_18/extensions/LiquidThreads/classes/Hooks.php 2012-03-17 
17:22:39 UTC (rev 114058)
@@ -309,12 +309,11 @@
        }
 
        public static function onLoadExtensionSchemaUpdates( $updater = null ) {
-               $dir = realpath( dirname( __FILE__ ) . '/..' );
+               $dir = dirname( __FILE__ );
 
                if ( $updater === null ) {
                        // DB updates
                        $wgExtNewTables[] = array( 'thread', "$dir/lqt.sql" );
-                       $wgExtNewTables[] = array( 'user_message_state', 
"$dir/lqt.sql" );
                        $wgExtNewTables[] = array( 'thread_history', 
"$dir/schema-changes/thread_history_table.sql" );
                        $wgExtNewTables[] = array( 
'thread_pending_relationship', 
"$dir/schema-changes/thread_pending_relationship.sql" );
                        $wgExtNewTables[] = array( 'thread_reaction', 
"$dir/schema-changes/thread_reactions.sql" );
@@ -338,7 +337,6 @@
                        $wgExtNewIndexes[] = array( 'thread', 
'thread_summary_page', '(thread_summary_page)' );
                } else {
                        $updater->addExtensionUpdate( array( 'addTable', 
'thread', "$dir/lqt.sql", true ) );
-                       $updater->addExtensionUpdate( array( 'addTable', 
'user_message_state', "$dir/lqt.sql", true ) );
                        $updater->addExtensionUpdate( array( 'addTable', 
'thread_history', "$dir/schema-changes/thread_history_table.sql", true ) );
                        $updater->addExtensionUpdate( array( 'addTable', 
'thread_pending_relationship', 
"$dir/schema-changes/thread_pending_relationship.sql", true ) );
                        $updater->addExtensionUpdate( array( 'addTable', 
'thread_reaction', "$dir/schema-changes/thread_reactions.sql", true ) );


Property changes on: branches/REL1_19/extensions/LiquidThreads
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk/extensions/LiquidThreads:57390,112660,112687,112751,112770-112771,112775,112849,112851,112856,112859,112903,112925,112993
   + 
/trunk/extensions/LiquidThreads:57390,112660,112687,112751,112770-112771,112775,112849,112851,112856,112859,112903,112925,112993,114057

Modified: branches/REL1_19/extensions/LiquidThreads/classes/Hooks.php
===================================================================
--- branches/REL1_19/extensions/LiquidThreads/classes/Hooks.php 2012-03-17 
17:19:18 UTC (rev 114057)
+++ branches/REL1_19/extensions/LiquidThreads/classes/Hooks.php 2012-03-17 
17:22:39 UTC (rev 114058)
@@ -338,10 +338,9 @@
         * @return bool
         */
        public static function onLoadExtensionSchemaUpdates( $updater = null ) {
-               $dir = realpath( dirname( __FILE__ ) . '/..' );
+               $dir = dirname( __FILE__ );
 
                $updater->addExtensionUpdate( array( 'addTable', 'thread', 
"$dir/lqt.sql", true ) );
-               $updater->addExtensionUpdate( array( 'addTable', 
'user_message_state', "$dir/lqt.sql", true ) );
                $updater->addExtensionUpdate( array( 'addTable', 
'thread_history', "$dir/schema-changes/thread_history_table.sql", true ) );
                $updater->addExtensionUpdate( array( 'addTable', 
'thread_pending_relationship', 
"$dir/schema-changes/thread_pending_relationship.sql", true ) );
                $updater->addExtensionUpdate( array( 'addTable', 
'thread_reaction', "$dir/schema-changes/thread_reactions.sql", true ) );


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to