| Index: trunk/extensions/SimpleSurvey/SimpleSurvey.php |
| — | — | @@ -3,7 +3,11 @@ |
| 4 | 4 | $dir = dirname( __FILE__ ) . '/'; |
| 5 | 5 | |
| 6 | 6 | // from prefswitch in usability initiative |
| 7 | | -$prefswitchdir = dirname( dirname( __FILE__ ) ) . "/UsabilityInitiative/PrefSwitch"; |
| | 7 | +$prefswitchdir = dirname( dirname( __FILE__ ) ) . "/PrefSwitch"; |
| | 8 | +// Horrible back for back compat with pre-r73480 installs |
| | 9 | +if ( !is_dir( $prefswitchdir ) ) { |
| | 10 | + $prefswitchdir = dirname( dirname( __FILE__ ) ) . "/UsabilityInitiative/PrefSwitch"; |
| | 11 | +} |
| 8 | 12 | |
| 9 | 13 | // Use this to override the URL of ext.prefSwitch.{js,css} if needed |
| 10 | 14 | $wgSimpleSurveyJSPath = null; |
| Index: trunk/extensions/SimpleSurvey/SpecialSimpleSurvey.php |
| — | — | @@ -91,10 +91,10 @@ |
| 92 | 92 | |
| 93 | 93 | global $wgExtensionAssetsPath, $wgSimpleSurveyJSPath, $wgSimpleSurveyCSSPath; |
| 94 | 94 | $script = Html::linkedScript( wfAppendQuery( $wgSimpleSurveyJSPath ? $wgSimpleSurveyJSPath : |
| 95 | | - "$wgExtensionAssetsPath/UsabilityInitiative/PrefSwitch/modules/ext.prefSwitch.js", $wgPrefSwitchStyleVersion ) ); |
| | 95 | + "$wgExtensionAssetsPath/PrefSwitch/modules/ext.prefSwitch.js", $wgPrefSwitchStyleVersion ) ); |
| 96 | 96 | $wgOut->addScript( $script ); |
| 97 | 97 | $wgOut->addExtensionStyle( wfAppendQuery( $wgSimpleSurveyCSSPath ? $wgSimpleSurveyCSSPath : |
| 98 | | - "$wgExtensionAssetsPath/UsabilityInitiative/PrefSwitch/modules/ext.prefSwitch.css", $wgPrefSwitchStyleVersion ) ); |
| | 98 | + "$wgExtensionAssetsPath/PrefSwitch/modules/ext.prefSwitch.css", $wgPrefSwitchStyleVersion ) ); |
| 99 | 99 | |
| 100 | 100 | // Handle various modes |
| 101 | 101 | $renderedSurvey = $this->render( $wgRequest->getVal( "survey" ) ); |