Index: trunk/extensions/Configure/Configure.func.php |
— | — | @@ -29,8 +29,7 @@ |
30 | 30 | foreach ( $all as $right ) { |
31 | 31 | $id = Sanitizer::escapeId( 'wpwgGroupPermissions-' . $group . '-' . $right ); |
32 | 32 | $desc = ( is_callable( array( 'User', 'getRightDescription' ) ) ) ? |
33 | | - User::getRightDescription( $right ) : |
34 | | - $right; |
| 33 | + User::getRightDescription( $right ) : $right; |
35 | 34 | $row .= '<li>' . Xml::checkLabel( $desc, $id, $id ) . "</li>\n"; |
36 | 35 | } |
37 | 36 | $row .= '</ul></div>'; |
Index: trunk/extensions/Configure/SpecialExtensions.php |
— | — | @@ -84,6 +84,7 @@ |
85 | 85 | |
86 | 86 | /** |
87 | 87 | * Build the content of the form |
| 88 | + * FIXME: register_globals |
88 | 89 | * |
89 | 90 | * @return xhtml |
90 | 91 | */ |
Index: trunk/extensions/Configure/Configure.obj.php |
— | — | @@ -81,12 +81,12 @@ |
82 | 82 | if ( defined( 'EXT_CONFIGURE_NO_EXTRACT' ) ) |
83 | 83 | return; |
84 | 84 | |
85 | | - // Include files before so that customized settings won't be overriden |
| 85 | + // Include files before so that customized settings won't be overridden |
86 | 86 | // by the default ones |
87 | 87 | $this->includeFiles(); |
88 | 88 | |
89 | | - ## Snapshot current settings before overriding. |
90 | | - ## ialex tells me this weird contraption will work |
| 89 | + // Snapshot current settings before overriding. |
| 90 | + // -ialex tells me this weird contraption will work |
91 | 91 | $allSettings = array_keys( ConfigurationSettings::singleton( CONF_SETTINGS_BOTH )->getAllSettings() ); |
92 | 92 | |
93 | 93 | foreach( $allSettings as $setting ) { |
Index: trunk/extensions/Configure/Configure.handler-files.php |
— | — | @@ -43,6 +43,7 @@ |
44 | 44 | /** |
45 | 45 | * Return the configuration from the conf-{$ts}.ser file in the $this->mDir |
46 | 46 | * Does *not* return site specific settings but *all* settings |
| 47 | + * FIXME: timestamp is not unique |
47 | 48 | * |
48 | 49 | * @param $ts timestamp |
49 | 50 | * @return array |
— | — | @@ -62,6 +63,7 @@ |
63 | 64 | |
64 | 65 | /** |
65 | 66 | * Returns the wikis in $ts version |
| 67 | + * FIXME: timestamp is not unique |
66 | 68 | * |
67 | 69 | * @param $ts timestamp |
68 | 70 | * @return array |
— | — | @@ -121,7 +123,8 @@ |
122 | 124 | if (isset( $settings['__metadata'] )) { |
123 | 125 | $metadata = $settings['__metadata']; |
124 | 126 | |
125 | | - $files[$m[1]] = array( 'username' => $metadata['user_name'], 'userwiki' => $metadata['user_wiki'], 'reason' => $metadata['reason'] ); |
| 127 | + $files[$m[1]] = array( 'username' => $metadata['user_name'], |
| 128 | + 'userwiki' => $metadata['user_wiki'], 'reason' => $metadata['reason'] ); |
126 | 129 | } else { |
127 | 130 | $files[$m[1]] = array( 'username' => false, 'userwiki' => false, 'reason' => false ); |
128 | 131 | } |