| Index: trunk/phase3/includes/api/ApiUpload.php |
| — | — | @@ -222,9 +222,10 @@ |
| 223 | 223 | $request = $this->getMain()->getRequest(); |
| 224 | 224 | |
| 225 | 225 | // chunk or one and only one of the following parameters is needed |
| 226 | | - if(!$this->mParams['chunk']) |
| | 226 | + if( !$this->mParams['chunk'] ) { |
| 227 | 227 | $this->requireOnlyOneParameter( $this->mParams, |
| 228 | | - 'filekey', 'file', 'url', 'statuskey' ); |
| | 228 | + 'filekey', 'file', 'url', 'statuskey' ); |
| | 229 | + } |
| 229 | 230 | |
| 230 | 231 | if ( $this->mParams['statuskey'] ) { |
| 231 | 232 | $this->checkAsyncDownloadEnabled(); |
| Index: trunk/extensions/MoodBar/MoodBar.hooks.php |
| — | — | @@ -3,6 +3,9 @@ |
| 4 | 4 | class MoodBarHooks { |
| 5 | 5 | /** |
| 6 | 6 | * Adds MoodBar JS to the output if appropriate. |
| | 7 | + * |
| | 8 | + * @param $output OutputPage |
| | 9 | + * @param $skin Skin |
| 7 | 10 | */ |
| 8 | 11 | public static function onPageDisplay( &$output, &$skin ) { |
| 9 | 12 | if ( self::shouldShowMoodbar( $output, $skin ) ) { |
| — | — | @@ -14,6 +17,9 @@ |
| 15 | 18 | |
| 16 | 19 | /** |
| 17 | 20 | * Determines whether or not we should show the MoodBar. |
| | 21 | + * |
| | 22 | + * @param $output OutputPage |
| | 23 | + * @param $skin Skin |
| 18 | 24 | */ |
| 19 | 25 | public static function shouldShowMoodbar( &$output, &$skin ) { |
| 20 | 26 | // Front-end appends to header elements, which have different |
| — | — | @@ -65,7 +71,9 @@ |
| 66 | 72 | } |
| 67 | 73 | |
| 68 | 74 | /** |
| 69 | | - * Runs MoodBar schema updates |
| | 75 | + * Runs MoodBar schema updates# |
| | 76 | + * |
| | 77 | + * @param $updater DatabasEUpdater |
| 70 | 78 | */ |
| 71 | 79 | public static function onLoadExtensionSchemaUpdates( $updater = null ) { |
| 72 | 80 | $updater->addExtensionUpdate( array( 'addTable', 'moodbar_feedback', |
| — | — | @@ -74,9 +82,9 @@ |
| 75 | 83 | $updater->addExtensionUpdate( array( 'addField', 'moodbar_feedback', |
| 76 | 84 | 'mbf_user_editcount', dirname(__FILE__).'/sql/mbf_user_editcount.sql', true ) |
| 77 | 85 | ); |
| 78 | | - |
| | 86 | + |
| 79 | 87 | $db = $updater->getDB(); |
| 80 | | - if ( $db->tableExists( 'moodbar_feedback' ) && |
| | 88 | + if ( $db->tableExists( 'moodbar_feedback' ) && |
| 81 | 89 | $db->indexExists( 'moodbar_feedback', 'type_timestamp', __METHOD__ ) ) |
| 82 | 90 | { |
| 83 | 91 | $updater->addExtensionUpdate( array( 'addIndex', 'moodbar_feedback', |
| — | — | @@ -86,11 +94,11 @@ |
| 87 | 95 | $updater->addExtensionUpdate( array( 'dropIndex', 'moodbar_feedback', |
| 88 | 96 | 'mbf_timestamp', dirname( __FILE__ ) . '/sql/AddIDToIndexes2.sql', true ) |
| 89 | 97 | ); |
| 90 | | - |
| | 98 | + |
| 91 | 99 | $updater->addExtensionUpdate( array( 'addIndex', 'moodbar_feedback', |
| 92 | 100 | 'mbf_timestamp_id', dirname( __FILE__ ) . '/sql/mbf_timestamp_id.sql', true ) |
| 93 | 101 | ); |
| 94 | | - |
| | 102 | + |
| 95 | 103 | $updater->addExtensionUpdate( array( 'addField', 'moodbar_feedback', |
| 96 | 104 | 'mbf_hidden_state', dirname(__FILE__).'/sql/mbf_hidden_state.sql', true ) ); |
| 97 | 105 | |