Index: trunk/extensions/QPoll/qp_user.php |
— | — | @@ -74,7 +74,8 @@ |
75 | 75 | * Add this extension to the mediawiki's extensions list. |
76 | 76 | */ |
77 | 77 | $qp_ExtDir = str_replace( "\\", "/", dirname(__FILE__) ); // filesys path with windows path fix |
78 | | -$qp_top_dir = array_pop( explode( '/', $qp_ExtDir ) ); |
| 78 | +$dirs = explode( '/', $qp_ExtDir ); |
| 79 | +$qp_top_dir = array_pop( $dirs ); |
79 | 80 | $qp_ScriptPath = $wgScriptPath . '/extensions' . ( ( $qp_top_dir == 'extensions' ) ? '' : '/' . $qp_top_dir ); // apache virtual path |
80 | 81 | |
81 | 82 | $wgExtensionMessagesFiles['QPoll'] = $qp_ExtDir . '/qp_i18n.php'; |
— | — | @@ -128,7 +129,7 @@ |
129 | 130 | global $qp_ScriptPath; |
130 | 131 | global $wgParser; |
131 | 132 | global $wgExtensionCredits; |
132 | | - global $wgQPollFunctionHook; |
| 133 | + global $wgQPollFunctionsHook; |
133 | 134 | global $wgContLang; |
134 | 135 | global $wgJsMimeType, $wgOut; |
135 | 136 | global $qp_enable_showresults; |