r73643 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r73642‎ | r73643 | r73644 >
Date:21:08, 23 September 2010
Author:neilk
Status:deferred
Tags:
Comment:
merges from trunk
Modified paths:
  • /branches/uploadwizard/extensions (modified) (history)
  • /branches/uploadwizard/extensions/ContactPageFundraiser (modified) (history)
  • /branches/uploadwizard/extensions/LocalisationUpdate (modified) (history)
  • /branches/uploadwizard/extensions/Translate/data/plural-gettext.txt (modified) (history)
  • /branches/uploadwizard/extensions/UploadWizard/SessionStash.php (modified) (history)
  • /branches/uploadwizard/extensions/UploadWizard/UploadWizardMessages.php (modified) (history)
  • /branches/uploadwizard/extensions/XMLRC/bridge/udp2xmpp-wikis.ini.sample (modified) (history)
  • /branches/uploadwizard/extensions/XMLRC/bridge/udp2xmpp.ini.sample (modified) (history)
  • /branches/uploadwizard/extensions/XMLRC/bridge/udp2xmpp.py (modified) (history)
  • /branches/uploadwizard/extensions/XMLRC/client/README (modified) (history)
  • /branches/uploadwizard/extensions/XMLRC/generator (modified) (history)
  • /branches/uploadwizard/extensions/XMLRC/generator/README (modified) (history)
  • /branches/uploadwizard/extensions/XMLRC/generator/rc2udp.ini.sample (modified) (history)
  • /branches/uploadwizard/extensions/XMLRC/generator/rc2udp.py (modified) (history)
  • /branches/uploadwizard/phase3 (modified) (history)
  • /branches/uploadwizard/phase3/COPYING (modified) (history)
  • /branches/uploadwizard/phase3/CREDITS (modified) (history)
  • /branches/uploadwizard/phase3/FAQ (modified) (history)
  • /branches/uploadwizard/phase3/HISTORY (modified) (history)
  • /branches/uploadwizard/phase3/INSTALL (modified) (history)
  • /branches/uploadwizard/phase3/README (modified) (history)
  • /branches/uploadwizard/phase3/RELEASE-NOTES (modified) (history)
  • /branches/uploadwizard/phase3/StartProfiler.sample (modified) (history)
  • /branches/uploadwizard/phase3/UPGRADE (modified) (history)
  • /branches/uploadwizard/phase3/api.php (modified) (history)
  • /branches/uploadwizard/phase3/api.php5 (modified) (history)
  • /branches/uploadwizard/phase3/bin (modified) (history)
  • /branches/uploadwizard/phase3/cache (modified) (history)
  • /branches/uploadwizard/phase3/config (modified) (history)
  • /branches/uploadwizard/phase3/docs (modified) (history)
  • /branches/uploadwizard/phase3/images (modified) (history)
  • /branches/uploadwizard/phase3/img_auth.php (modified) (history)
  • /branches/uploadwizard/phase3/img_auth.php5 (modified) (history)
  • /branches/uploadwizard/phase3/includes (modified) (history)
  • /branches/uploadwizard/phase3/includes/ChangesList.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/ConfEditor.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/DefaultSettings.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/EditPage.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/GlobalFunctions.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/HistoryPage.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/Interwiki.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/Message.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/OutputPage.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/ProtectionForm.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/ResourceLoader.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/ResourceLoaderContext.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/Title.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/WebRequest.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/api (modified) (history)
  • /branches/uploadwizard/phase3/includes/installer/DatabaseInstaller.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/json/Services_JSON.php (modified) (history)
  • /branches/uploadwizard/phase3/includes/specials (modified) (history)
  • /branches/uploadwizard/phase3/includes/specials/SpecialUserlogin.php (modified) (history)
  • /branches/uploadwizard/phase3/index.php (modified) (history)
  • /branches/uploadwizard/phase3/index.php5 (modified) (history)
  • /branches/uploadwizard/phase3/languages (modified) (history)
  • /branches/uploadwizard/phase3/load.php (modified) (history)
  • /branches/uploadwizard/phase3/load.php5 (modified) (history)
  • /branches/uploadwizard/phase3/maintenance (modified) (history)
  • /branches/uploadwizard/phase3/maintenance/archives (modified) (history)
  • /branches/uploadwizard/phase3/maintenance/cleanupTable.inc (modified) (history)
  • /branches/uploadwizard/phase3/maintenance/deleteSelfExternals.php (modified) (history)
  • /branches/uploadwizard/phase3/maintenance/populateRevisionLength.php (modified) (history)
  • /branches/uploadwizard/phase3/maintenance/tables.sql (modified) (history)
  • /branches/uploadwizard/phase3/maintenance/tests (modified) (history)
  • /branches/uploadwizard/phase3/math (modified) (history)
  • /branches/uploadwizard/phase3/opensearch_desc.php (modified) (history)
  • /branches/uploadwizard/phase3/opensearch_desc.php5 (modified) (history)
  • /branches/uploadwizard/phase3/php5.php5 (modified) (history)
  • /branches/uploadwizard/phase3/profileinfo.php (modified) (history)
  • /branches/uploadwizard/phase3/redirect.php (modified) (history)
  • /branches/uploadwizard/phase3/redirect.php5 (modified) (history)
  • /branches/uploadwizard/phase3/redirect.phtml (modified) (history)
  • /branches/uploadwizard/phase3/resources (modified) (history)
  • /branches/uploadwizard/phase3/serialized (modified) (history)
  • /branches/uploadwizard/phase3/skins (modified) (history)
  • /branches/uploadwizard/phase3/skins/common/ajaxwatch.js (modified) (history)
  • /branches/uploadwizard/phase3/skins/vector/screen.css (modified) (history)
  • /branches/uploadwizard/phase3/thumb.php (modified) (history)
  • /branches/uploadwizard/phase3/thumb.php5 (modified) (history)
  • /branches/uploadwizard/phase3/trackback.php (modified) (history)
  • /branches/uploadwizard/phase3/trackback.php5 (modified) (history)
  • /branches/uploadwizard/phase3/wiki.phtml (modified) (history)

Diff [purge]

Property changes on: branches/uploadwizard/phase3/index.php5
___________________________________________________________________
Added: svn:mergeinfo
11 Merged /branches/REL1_15/phase3/index.php5:r51646
22 Merged /branches/sqlite/index.php5:r58211-58321
33 Merged /trunk/phase3/index.php5:r73549-73568
44 Merged /branches/new-installer/phase3/index.php5:r43664-66004
Property changes on: branches/uploadwizard/phase3/maintenance/tables.sql
___________________________________________________________________
Modified: svn:mergeinfo
55 Merged /trunk/phase3/maintenance/tables.sql:r73549-73568
Property changes on: branches/uploadwizard/phase3/maintenance/archives
___________________________________________________________________
Modified: svn:mergeinfo
66 Merged /trunk/phase3/maintenance/archives:r73549-73568
Property changes on: branches/uploadwizard/phase3/maintenance/populateRevisionLength.php
___________________________________________________________________
Modified: svn:mergeinfo
77 Merged /trunk/phase3/maintenance/populateRevisionLength.php:r73549-73568
Property changes on: branches/uploadwizard/phase3/maintenance/cleanupTable.inc
___________________________________________________________________
Modified: svn:mergeinfo
88 Merged /trunk/phase3/maintenance/cleanupTable.inc:r73549-73568
Property changes on: branches/uploadwizard/phase3/maintenance/deleteSelfExternals.php
___________________________________________________________________
Modified: svn:mergeinfo
99 Merged /trunk/phase3/maintenance/deleteSelfExternals.php:r73549-73568
Property changes on: branches/uploadwizard/phase3/maintenance/tests
___________________________________________________________________
Modified: svn:mergeinfo
1010 Merged /trunk/phase3/maintenance/tests:r73549-73568
Property changes on: branches/uploadwizard/phase3/maintenance
___________________________________________________________________
Added: svn:mergeinfo
1111 Merged /branches/REL1_15/phase3/maintenance:r51646
1212 Merged /branches/sqlite/maintenance:r58211-58321
1313 Merged /trunk/phase3/maintenance:r73549-73568
1414 Merged /branches/new-installer/phase3/maintenance:r43664-66004
Property changes on: branches/uploadwizard/phase3/img_auth.php
___________________________________________________________________
Added: svn:mergeinfo
1515 Merged /branches/REL1_15/phase3/img_auth.php:r51646
1616 Merged /branches/sqlite/img_auth.php:r58211-58321
1717 Merged /trunk/phase3/img_auth.php:r73549-73568
1818 Merged /branches/new-installer/phase3/img_auth.php:r43664-66004
Property changes on: branches/uploadwizard/phase3/api.php5
___________________________________________________________________
Added: svn:mergeinfo
1919 Merged /branches/new-installer/phase3/api.php5:r43664-66004
2020 Merged /branches/REL1_15/phase3/api.php5:r51646
2121 Merged /branches/sqlite/api.php5:r58211-58321
2222 Merged /trunk/phase3/api.php5:r73549-73568
Property changes on: branches/uploadwizard/phase3/redirect.phtml
___________________________________________________________________
Added: svn:mergeinfo
2323 Merged /branches/new-installer/phase3/redirect.phtml:r43664-66004
2424 Merged /branches/REL1_15/phase3/redirect.phtml:r51646
2525 Merged /branches/sqlite/redirect.phtml:r58211-58321
2626 Merged /trunk/phase3/redirect.phtml:r73549-73568
Property changes on: branches/uploadwizard/phase3/wiki.phtml
___________________________________________________________________
Added: svn:mergeinfo
2727 Merged /branches/new-installer/phase3/wiki.phtml:r43664-66004
2828 Merged /branches/REL1_15/phase3/wiki.phtml:r51646
2929 Merged /branches/sqlite/wiki.phtml:r58211-58321
3030 Merged /trunk/phase3/wiki.phtml:r73549-73568
Property changes on: branches/uploadwizard/phase3/redirect.php
___________________________________________________________________
Added: svn:mergeinfo
3131 Merged /branches/new-installer/phase3/redirect.php:r43664-66004
3232 Merged /branches/REL1_15/phase3/redirect.php:r51646
3333 Merged /branches/sqlite/redirect.php:r58211-58321
3434 Merged /trunk/phase3/redirect.php:r73549-73568
Property changes on: branches/uploadwizard/phase3/php5.php5
___________________________________________________________________
Added: svn:mergeinfo
3535 Merged /branches/new-installer/phase3/php5.php5:r43664-66004
3636 Merged /branches/REL1_15/phase3/php5.php5:r51646
3737 Merged /branches/sqlite/php5.php5:r58211-58321
3838 Merged /trunk/phase3/php5.php5:r73549-73568
Property changes on: branches/uploadwizard/phase3/UPGRADE
___________________________________________________________________
Added: svn:mergeinfo
3939 Merged /branches/new-installer/phase3/UPGRADE:r43664-66004
4040 Merged /branches/REL1_15/phase3/UPGRADE:r51646
4141 Merged /branches/sqlite/UPGRADE:r58211-58321
4242 Merged /trunk/phase3/UPGRADE:r73549-73568
Index: branches/uploadwizard/phase3/skins/vector/screen.css
——@@ -363,7 +363,10 @@
364364 font-size: 13px;
365365 top: 0.25em;
366366 }
367 - div#simpleSearch .placeholder {
 367+ div#simpleSearch input {
 368+ color: black;
 369+ }
 370+ div#simpleSearch input.placeholder {
368371 color: #999999;
369372 }
370373 div#simpleSearch input::-webkit-input-placeholder {
Index: branches/uploadwizard/phase3/skins/common/ajaxwatch.js
——@@ -9,22 +9,20 @@
1010 }
1111
1212 wgAjaxWatch.setLinkText = function( $link, action ) {
13 - if( action == 'watch' || action == 'unwatch' ) {
 13+ if ( action == 'watch' || action == 'unwatch' ) {
1414 // save the accesskey from the title
15 - var keyCommand = $link.attr( 'title' ).match( /\[.*?\]$/ )
16 - ? $link.attr( 'title' ).match( /\[.*?\]$/ )[0]
17 - : '';
18 - $link.attr( 'title', mediaWiki.msg.get( 'tooltip-ca-' + action + 'Msg') + ' ' + keyCommand );
 15+ var keyCommand = $link.attr( 'title' ).match( /\[.*?\]$/ ) ? $link.attr( 'title' ).match( /\[.*?\]$/ )[0] : '';
 16+ $link.attr( 'title', mediaWiki.msg.get( 'tooltip-ca-' + action ) + ' ' + keyCommand );
1917 }
20 - if( $link.data( 'icon' ) ) {
21 - $link.attr( 'alt', mediaWiki.msg.get( action + 'Msg' ) );
 18+ if ( $link.data( 'icon' ) ) {
 19+ $link.attr( 'alt', mediaWiki.msg.get( action ) );
2220 if ( action == 'watching' || action == 'unwatching' ) {
2321 $link.addClass( 'loading' );
2422 } else {
2523 $link.removeClass( 'loading' );
2624 }
2725 } else {
28 - $link.html( mediaWiki.msg.get( action + 'Msg' ) );
 26+ $link.html( mediaWiki.msg.get( action ) );
2927 }
3028 };
3129
——@@ -112,7 +110,7 @@
113111 if( $link.parents( 'li' ).attr( 'id' ) == 'ca-' + action ) {
114112 $link.parents( 'li' ).attr( 'id', 'ca-' + otheraction );
115113 // update the link text with the new message
116 - $link.text( mediaWiki.msg.get( otheraction + 'Msg' ) );
 114+ $link.text( mediaWiki.msg.get( otheraction ) );
117115 }
118116 };
119117 return false;
Property changes on: branches/uploadwizard/phase3/skins
___________________________________________________________________
Added: svn:mergeinfo
120118 Merged /branches/new-installer/phase3/skins:r43664-66004
121119 Merged /branches/REL1_15/phase3/skins:r51646
122120 Merged /branches/sqlite/skins:r58211-58321
123121 Merged /trunk/phase3/skins:r73549-73568
Property changes on: branches/uploadwizard/phase3/thumb.php5
___________________________________________________________________
Added: svn:mergeinfo
124122 Merged /branches/sqlite/thumb.php5:r58211-58321
125123 Merged /trunk/phase3/thumb.php5:r73549-73568
126124 Merged /branches/new-installer/phase3/thumb.php5:r43664-66004
127125 Merged /branches/REL1_15/phase3/thumb.php5:r51646
Property changes on: branches/uploadwizard/phase3/serialized
___________________________________________________________________
Added: svn:mergeinfo
128126 Merged /branches/sqlite/serialized:r58211-58321
129127 Merged /trunk/phase3/serialized:r73549-73568
130128 Merged /branches/new-installer/phase3/serialized:r43664-66004
131129 Merged /branches/REL1_15/phase3/serialized:r51646
Property changes on: branches/uploadwizard/phase3/README
___________________________________________________________________
Added: svn:mergeinfo
132130 Merged /branches/sqlite/README:r58211-58321
133131 Merged /trunk/phase3/README:r73549-73568
134132 Merged /branches/new-installer/phase3/README:r43664-66004
135133 Merged /branches/REL1_15/phase3/README:r51646
Property changes on: branches/uploadwizard/phase3/CREDITS
___________________________________________________________________
Added: svn:mergeinfo
136134 Merged /branches/sqlite/CREDITS:r58211-58321
137135 Merged /trunk/phase3/CREDITS:r73549-73568
138136 Merged /branches/new-installer/phase3/CREDITS:r43664-66004
139137 Merged /branches/REL1_15/phase3/CREDITS:r51646
Property changes on: branches/uploadwizard/phase3/HISTORY
___________________________________________________________________
Added: svn:mergeinfo
140138 Merged /branches/REL1_15/phase3/HISTORY:r51646
141139 Merged /branches/sqlite/HISTORY:r58211-58321
142140 Merged /trunk/phase3/HISTORY:r73549-73568
143141 Merged /branches/new-installer/phase3/HISTORY:r43664-66004
Property changes on: branches/uploadwizard/phase3/cache
___________________________________________________________________
Added: svn:mergeinfo
144142 Merged /branches/REL1_15/phase3/cache:r51646
145143 Merged /branches/sqlite/cache:r58211-58321
146144 Merged /trunk/phase3/cache:r73549-73568
147145 Merged /branches/new-installer/phase3/cache:r43664-66004
Property changes on: branches/uploadwizard/phase3/config
___________________________________________________________________
Added: svn:mergeinfo
148146 Merged /branches/new-installer/phase3/config:r43664-66004
149147 Merged /branches/REL1_15/phase3/config:r51646
150148 Merged /branches/sqlite/config:r58211-58321
151149 Merged /trunk/phase3/config:r73549-73568
Property changes on: branches/uploadwizard/phase3/load.php
___________________________________________________________________
Added: svn:mergeinfo
152150 Merged /branches/new-installer/phase3/load.php:r43664-66004
153151 Merged /branches/REL1_15/phase3/load.php:r51646
154152 Merged /branches/sqlite/load.php:r58211-58321
155153 Merged /trunk/phase3/load.php:r73549-73568
Property changes on: branches/uploadwizard/phase3/INSTALL
___________________________________________________________________
Added: svn:mergeinfo
156154 Merged /branches/new-installer/phase3/INSTALL:r43664-66004
157155 Merged /branches/REL1_15/phase3/INSTALL:r51646
158156 Merged /branches/sqlite/INSTALL:r58211-58321
159157 Merged /trunk/phase3/INSTALL:r73549-73568
Property changes on: branches/uploadwizard/phase3/img_auth.php5
___________________________________________________________________
Added: svn:mergeinfo
160158 Merged /branches/new-installer/phase3/img_auth.php5:r43664-66004
161159 Merged /branches/REL1_15/phase3/img_auth.php5:r51646
162160 Merged /branches/sqlite/img_auth.php5:r58211-58321
163161 Merged /trunk/phase3/img_auth.php5:r73549-73568
Property changes on: branches/uploadwizard/phase3/COPYING
___________________________________________________________________
Added: svn:mergeinfo
164162 Merged /branches/new-installer/phase3/COPYING:r43664-66004
165163 Merged /branches/REL1_15/phase3/COPYING:r51646
166164 Merged /branches/sqlite/COPYING:r58211-58321
167165 Merged /trunk/phase3/COPYING:r73549-73568
Property changes on: branches/uploadwizard/phase3/bin
___________________________________________________________________
Added: svn:mergeinfo
168166 Merged /branches/new-installer/phase3/bin:r43664-66004
169167 Merged /branches/REL1_15/phase3/bin:r51646
170168 Merged /branches/sqlite/bin:r58211-58321
171169 Merged /trunk/phase3/bin:r73549-73568
Property changes on: branches/uploadwizard/phase3/opensearch_desc.php
___________________________________________________________________
Added: svn:mergeinfo
172170 Merged /branches/sqlite/opensearch_desc.php:r58211-58321
173171 Merged /trunk/phase3/opensearch_desc.php:r73549-73568
174172 Merged /branches/new-installer/phase3/opensearch_desc.php:r43664-66004
175173 Merged /branches/REL1_15/phase3/opensearch_desc.php:r51646
Property changes on: branches/uploadwizard/phase3/trackback.php
___________________________________________________________________
Added: svn:mergeinfo
176174 Merged /branches/sqlite/trackback.php:r58211-58321
177175 Merged /trunk/phase3/trackback.php:r73549-73568
178176 Merged /branches/new-installer/phase3/trackback.php:r43664-66004
179177 Merged /branches/REL1_15/phase3/trackback.php:r51646
Property changes on: branches/uploadwizard/phase3/redirect.php5
___________________________________________________________________
Added: svn:mergeinfo
180178 Merged /branches/sqlite/redirect.php5:r58211-58321
181179 Merged /trunk/phase3/redirect.php5:r73549-73568
182180 Merged /branches/new-installer/phase3/redirect.php5:r43664-66004
183181 Merged /branches/REL1_15/phase3/redirect.php5:r51646
Property changes on: branches/uploadwizard/phase3/StartProfiler.sample
___________________________________________________________________
Added: svn:mergeinfo
184182 Merged /branches/REL1_15/phase3/StartProfiler.sample:r51646
185183 Merged /branches/sqlite/StartProfiler.sample:r58211-58321
186184 Merged /trunk/phase3/StartProfiler.sample:r73549-73568
187185 Merged /branches/new-installer/phase3/StartProfiler.sample:r43664-66004
Property changes on: branches/uploadwizard/phase3/docs
___________________________________________________________________
Added: svn:mergeinfo
188186 Merged /branches/new-installer/phase3/docs:r43664-66004
189187 Merged /branches/REL1_15/phase3/docs:r51646
190188 Merged /branches/sqlite/docs:r58211-58321
191189 Merged /trunk/phase3/docs:r73549-73568
Property changes on: branches/uploadwizard/phase3/math
___________________________________________________________________
Added: svn:mergeinfo
192190 Merged /branches/new-installer/phase3/math:r43664-66004
193191 Merged /branches/REL1_15/phase3/math:r51646
194192 Merged /branches/sqlite/math:r58211-58321
195193 Merged /trunk/phase3/math:r73549-73568
Property changes on: branches/uploadwizard/phase3/load.php5
___________________________________________________________________
Added: svn:mergeinfo
196194 Merged /branches/sqlite/load.php5:r58211-58321
197195 Merged /trunk/phase3/load.php5:r73549-73568
198196 Merged /branches/new-installer/phase3/load.php5:r43664-66004
199197 Merged /branches/REL1_15/phase3/load.php5:r51646
Property changes on: branches/uploadwizard/phase3/index.php
___________________________________________________________________
Added: svn:mergeinfo
200198 Merged /branches/sqlite/index.php:r58211-58321
201199 Merged /trunk/phase3/index.php:r73549-73568
202200 Merged /branches/new-installer/phase3/index.php:r43664-66004
203201 Merged /branches/REL1_15/phase3/index.php:r51646
Property changes on: branches/uploadwizard/phase3/api.php
___________________________________________________________________
Added: svn:mergeinfo
204202 Merged /branches/sqlite/api.php:r58211-58321
205203 Merged /trunk/phase3/api.php:r73549-73568
206204 Merged /branches/new-installer/phase3/api.php:r43664-66004
207205 Merged /branches/REL1_15/phase3/api.php:r51646
Property changes on: branches/uploadwizard/phase3/opensearch_desc.php5
___________________________________________________________________
Added: svn:mergeinfo
208206 Merged /branches/REL1_15/phase3/opensearch_desc.php5:r51646
209207 Merged /branches/sqlite/opensearch_desc.php5:r58211-58321
210208 Merged /trunk/phase3/opensearch_desc.php5:r73549-73568
211209 Merged /branches/new-installer/phase3/opensearch_desc.php5:r43664-66004
Property changes on: branches/uploadwizard/phase3/trackback.php5
___________________________________________________________________
Added: svn:mergeinfo
212210 Merged /branches/REL1_15/phase3/trackback.php5:r51646
213211 Merged /branches/sqlite/trackback.php5:r58211-58321
214212 Merged /trunk/phase3/trackback.php5:r73549-73568
215213 Merged /branches/new-installer/phase3/trackback.php5:r43664-66004
Property changes on: branches/uploadwizard/phase3/profileinfo.php
___________________________________________________________________
Added: svn:mergeinfo
216214 Merged /branches/REL1_15/phase3/profileinfo.php:r51646
217215 Merged /branches/sqlite/profileinfo.php:r58211-58321
218216 Merged /trunk/phase3/profileinfo.php:r73549-73568
219217 Merged /branches/new-installer/phase3/profileinfo.php:r43664-66004
Property changes on: branches/uploadwizard/phase3/thumb.php
___________________________________________________________________
Added: svn:mergeinfo
220218 Merged /branches/new-installer/phase3/thumb.php:r43664-66004
221219 Merged /branches/REL1_15/phase3/thumb.php:r51646
222220 Merged /branches/sqlite/thumb.php:r58211-58321
223221 Merged /trunk/phase3/thumb.php:r73549-73568
Property changes on: branches/uploadwizard/phase3/images
___________________________________________________________________
Added: svn:mergeinfo
224222 Merged /branches/new-installer/phase3/images:r43664-66004
225223 Merged /branches/REL1_15/phase3/images:r51646
226224 Merged /branches/sqlite/images:r58211-58321
227225 Merged /trunk/phase3/images:r73549-73568
Index: branches/uploadwizard/phase3/RELEASE-NOTES
——@@ -57,11 +57,11 @@
5858 * $wgVectorExtraStyles was removed, and is no longer in use.
5959 * $wgLoadScript was added to specify alternative locations for ResourceLoader
6060 requests.
61 -* $wgResourceLoaderVersionedClientMaxage, $wgResourceLoaderVersionedServerMaxage,
62 - $wgResourceLoaderUnversionedClientMaxage and
63 - $wgResourceLoaderUnversionedServerMaxage were added to specify maxage and
64 - smaxage times for responses from ResourceLoader based on whether the request's
65 - URL contained a version parameter or not.
 61+* $wgResourceLoaderMaxage was added to specify maxage and smaxage times for
 62+ responses from ResourceLoader based on whether the request's URL contained a
 63+ version parameter or not.
 64+* $wgResourceLoaderDebug was added to specify the default state of debug mode;
 65+ this will still be overridden with the debug URL parameter a la $wgLanguageCode.
6666
6767 === New features in 1.17 ===
6868 * (bug 10183) Users can now add personal styles and scripts to all skins via
Property changes on: branches/uploadwizard/phase3/RELEASE-NOTES
___________________________________________________________________
Added: svn:mergeinfo
6969 Merged /branches/new-installer/phase3/RELEASE-NOTES:r43664-66004
7070 Merged /branches/REL1_15/phase3/RELEASE-NOTES:r51646
7171 Merged /branches/sqlite/RELEASE-NOTES:r58211-58321
7272 Merged /trunk/phase3/RELEASE-NOTES:r73549-73568
Property changes on: branches/uploadwizard/phase3/languages
___________________________________________________________________
Added: svn:mergeinfo
7373 Merged /branches/new-installer/phase3/languages:r43664-66004
7474 Merged /branches/REL1_15/phase3/languages:r51646
7575 Merged /branches/sqlite/languages:r58211-58321
7676 Merged /trunk/phase3/languages:r73549-73568
Index: branches/uploadwizard/phase3/includes/OutputPage.php
——@@ -2281,12 +2281,12 @@
22822282 }
22832283
22842284 static function makeResourceLoaderLink( $skin, $modules, $only ) {
2285 - global $wgUser, $wgLang, $wgRequest, $wgLoadScript;
 2285+ global $wgUser, $wgLang, $wgRequest, $wgLoadScript, $wgResourceLoaderDebug;
22862286 // TODO: Should this be a static function of ResourceLoader instead?
22872287 // TODO: Divide off modules starting with "user", and add the user parameter to them
22882288 $query = array(
22892289 'lang' => $wgLang->getCode(),
2290 - 'debug' => ( $wgRequest->getBool( 'debug' ) && $wgRequest->getVal( 'debug' ) == 'true' ) ? 'true' : 'false',
 2290+ 'debug' => $wgRequest->getFuzzyBool( 'debug', $wgResourceLoaderDebug ) ? 'true' : 'false',
22912291 'skin' => $wgUser->getSkin()->getSkinName(),
22922292 'only' => $only,
22932293 );
——@@ -2346,8 +2346,7 @@
23472347 * @return String: HTML fragment
23482348 */
23492349 function getHeadScripts( Skin $sk ) {
2350 - global $wgUser, $wgRequest;
2351 - global $wgUseSiteJs;
 2350+ global $wgUser, $wgRequest, $wgUseSiteJs, $wgResourceLoaderDebug;
23522351
23532352 // Statup - this will immediately load jquery and mediawiki modules
23542353 $scripts = self::makeResourceLoaderLink( $sk, 'startup', 'scripts' );
——@@ -2357,7 +2356,7 @@
23582357 $scripts .= Skin::makeGlobalVariablesScript( $sk->getSkinName() ) . "\n";
23592358
23602359 // Script and Messages "only"
2361 - if ( $wgRequest->getBool( 'debug' ) && $wgRequest->getVal( 'debug' ) !== 'false' ) {
 2360+ if ( $wgRequest->getFuzzyBool( 'debug', $wgResourceLoaderDebug ) ) {
23622361 // Scripts
23632362 foreach ( $this->getModuleScripts() as $name ) {
23642363 $scripts .= self::makeResourceLoaderLink( $sk, $name, 'scripts' );
——@@ -2381,7 +2380,7 @@
23822381 if ( $this->getModules() ) {
23832382 $modules = FormatJson::encode( $this->getModules() );
23842383 $scripts .= Html::inlineScript(
2385 - "if ( mediaWiki !== undefined ) { mediaWiki.loader.load( {$modules} ); mediaWiki.loader.go(); }"
 2384+ "if ( window.mediaWiki ) { mediaWiki.loader.load( {$modules} ); mediaWiki.loader.go(); }"
23862385 ) . "\n";
23872386 }
23882387
——@@ -2455,7 +2454,7 @@
24562455 * @return string HTML tag links to be put in the header.
24572456 */
24582457 public function getHeadLinks( $sk ) {
2459 - global $wgFeed, $wgRequest;
 2458+ global $wgFeed, $wgRequest, $wgResourceLoaderDebug;
24602459
24612460 // Ideally this should happen earlier, somewhere. :P
24622461 $this->addDefaultMeta();
——@@ -2526,7 +2525,7 @@
25272526 }
25282527
25292528 // Support individual script requests in debug mode
2530 - if ( $wgRequest->getBool( 'debug' ) && $wgRequest->getVal( 'debug' ) !== 'false' ) {
 2529+ if ( $wgRequest->getFuzzyBool( 'debug', $wgResourceLoaderDebug ) ) {
25312530 foreach ( $this->getModuleStyles() as $name ) {
25322531 $tags[] = self::makeResourceLoaderLink( $sk, $name, 'styles' );
25332532 }
Property changes on: branches/uploadwizard/phase3/includes/OutputPage.php
___________________________________________________________________
Modified: svn:mergeinfo
25342533 Merged /trunk/phase3/includes/OutputPage.php:r73549-73568
Index: branches/uploadwizard/phase3/includes/ResourceLoader.php
——@@ -249,8 +249,7 @@
250250 * @param $context ResourceLoaderContext object
251251 */
252252 public static function respond( ResourceLoaderContext $context ) {
253 - global $wgResourceLoaderVersionedClientMaxage, $wgResourceLoaderVersionedServerMaxage;
254 - global $wgResourceLoaderUnversionedServerMaxage, $wgResourceLoaderUnversionedClientMaxage;
 253+ global $wgResourceLoaderMaxage;
255254
256255 wfProfileIn( __METHOD__ );
257256 self::initialize();
——@@ -270,14 +269,14 @@
271270 // If a version wasn't specified we need a shorter expiry time for updates to
272271 // propagate to clients quickly
273272 if ( is_null( $context->getVersion() ) ) {
274 - $maxage = $wgResourceLoaderUnversionedClientMaxage;
275 - $smaxage = $wgResourceLoaderUnversionedServerMaxage;
 273+ $maxage = $wgResourceLoaderMaxage['unversioned']['client'];
 274+ $smaxage = $wgResourceLoaderMaxage['unversioned']['server'];
276275 }
277276 // If a version was specified we can use a longer expiry time since changing
278277 // version numbers causes cache misses
279278 else {
280 - $maxage = $wgResourceLoaderVersionedClientMaxage;
281 - $smaxage = $wgResourceLoaderVersionedServerMaxage;
 279+ $maxage = $wgResourceLoaderMaxage['versioned']['client'];
 280+ $smaxage = $wgResourceLoaderMaxage['versioned']['server'];
282281 }
283282
284283 // To send Last-Modified and support If-Modified-Since, we need to detect
Property changes on: branches/uploadwizard/phase3/includes/ResourceLoader.php
___________________________________________________________________
Modified: svn:mergeinfo
285284 Merged /trunk/phase3/includes/ResourceLoader.php:r73549-73568
Index: branches/uploadwizard/phase3/includes/WebRequest.php
——@@ -347,6 +347,19 @@
348348 public function getBool( $name, $default = false ) {
349349 return $this->getVal( $name, $default ) ? true : false;
350350 }
 351+
 352+ /**
 353+ * Fetch a boolean value from the input or return $default if not set.
 354+ * Unlike getBool, the string "false" will result in boolean false, which is
 355+ * useful when interpreting information sent from JavaScript.
 356+ *
 357+ * @param $name String
 358+ * @param $default Boolean
 359+ * @return Boolean
 360+ */
 361+ public function getFuzzyBool( $name, $default = false ) {
 362+ return $this->getBool( $name, $default ) && $this->getVal( $name ) !== 'false';
 363+ }
351364
352365 /**
353366 * Return true if the named value is set in the input, whatever that
Property changes on: branches/uploadwizard/phase3/includes/Interwiki.php
___________________________________________________________________
Modified: svn:mergeinfo
354367 Merged /trunk/phase3/includes/Interwiki.php:r73549-73568
Property changes on: branches/uploadwizard/phase3/includes/GlobalFunctions.php
___________________________________________________________________
Modified: svn:mergeinfo
355368 Merged /trunk/phase3/includes/GlobalFunctions.php:r73549-73568
Property changes on: branches/uploadwizard/phase3/includes/ConfEditor.php
___________________________________________________________________
Modified: svn:mergeinfo
356369 Merged /trunk/phase3/includes/ConfEditor.php:r73549-73568
Index: branches/uploadwizard/phase3/includes/specials/SpecialUserlogin.php
——@@ -968,8 +968,6 @@
969969 }
970970 }
971971
972 - $titleObj = SpecialPage::getTitleFor( 'Userlogin' );
973 -
974972 if ( $this->mType == 'signup' ) {
975973 global $wgLivePasswordStrengthChecks;
976974 if ( $wgLivePasswordStrengthChecks ) {
Property changes on: branches/uploadwizard/phase3/includes/specials
___________________________________________________________________
Modified: svn:mergeinfo
977975 Merged /trunk/phase3/includes/specials:r73549-73568
Index: branches/uploadwizard/phase3/includes/ResourceLoaderContext.php
——@@ -40,7 +40,7 @@
4141 /* Methods */
4242
4343 public function __construct( WebRequest $request ) {
44 - global $wgLang, $wgDefaultSkin;
 44+ global $wgLang, $wgDefaultSkin, $wgResourceLoaderDebug;
4545
4646 $this->request = $request;
4747 // Interperet request
——@@ -49,7 +49,7 @@
5050 $this->direction = $request->getVal( 'dir' );
5151 $this->skin = $request->getVal( 'skin' );
5252 $this->user = $request->getVal( 'user' );
53 - $this->debug = $request->getBool( 'debug' ) && $request->getVal( 'debug' ) === 'true';
 53+ $this->debug = $request->getFuzzyBool( 'debug', $wgResourceLoaderDebug );
5454 $this->only = $request->getVal( 'only' );
5555 $this->version = $request->getVal( 'version' );
5656
Property changes on: branches/uploadwizard/phase3/includes/HistoryPage.php
___________________________________________________________________
Modified: svn:mergeinfo
5757 Merged /trunk/phase3/includes/HistoryPage.php:r73549-73568
Property changes on: branches/uploadwizard/phase3/includes/installer/DatabaseInstaller.php
___________________________________________________________________
Modified: svn:mergeinfo
5858 Merged /trunk/phase3/includes/installer/DatabaseInstaller.php:r73549-73568
Property changes on: branches/uploadwizard/phase3/includes/api
___________________________________________________________________
Modified: svn:mergeinfo
5959 Merged /trunk/phase3/includes/api:r73549-73568
Property changes on: branches/uploadwizard/phase3/includes/ChangesList.php
___________________________________________________________________
Modified: svn:mergeinfo
6060 Merged /trunk/phase3/includes/ChangesList.php:r73549-73568
Index: branches/uploadwizard/phase3/includes/ProtectionForm.php
——@@ -592,7 +592,7 @@
593593 $encOptions = Xml::encodeJsVar( $options );
594594
595595 $script .= "ProtectionForm.init($encOptions)";
596 - return Html::inlineScript( "if ( mediaWiki !== undefined ) { mediaWiki.loader.using( 'mediawiki.legacy.protect', function() { {$script} } ); }" );
 596+ return Html::inlineScript( "if ( window.mediaWiki ) { $script }" );
597597 }
598598
599599 /**
Property changes on: branches/uploadwizard/phase3/includes/Title.php
___________________________________________________________________
Modified: svn:mergeinfo
600600 Merged /trunk/phase3/includes/Title.php:r73549-73568
Property changes on: branches/uploadwizard/phase3/includes/json/Services_JSON.php
___________________________________________________________________
Modified: svn:mergeinfo
601601 Merged /trunk/phase3/includes/json/Services_JSON.php:r73549-73568
Index: branches/uploadwizard/phase3/includes/Message.php
——@@ -158,7 +158,9 @@
159159 if( $lang instanceof Language ){
160160 $this->language = $lang;
161161 } elseif ( is_string( $lang ) ) {
162 - $this->language = Language::factory( $lang );
 162+ if( $this->language->getCode() != $lang ) {
 163+ $this->language = Language::factory( $lang );
 164+ }
163165 } else {
164166 $type = gettype( $lang );
165167 throw new MWException( __METHOD__ . " must be "
Index: branches/uploadwizard/phase3/includes/DefaultSettings.php
——@@ -1645,32 +1645,28 @@
16461646 $wgClockSkewFudge = 5;
16471647
16481648 /**
1649 - * Maximum time in seconds to cache versioned resources served by the resource
1650 - * loader on the client side (e.g. in the browser cache).
 1649+ * Maximum time in seconds to cache resources served by the resource loader
16511650 */
1652 -$wgResourceLoaderVersionedClientMaxage = 30 * 24 * 60 * 60; // 30 days
 1651+$wgResourceLoaderMaxage = array(
 1652+ 'versioned' => array(
 1653+ // Squid/Varnish but also any other public proxy cache between the client and MediaWiki
 1654+ 'server' => 30 * 24 * 60 * 60, // 30 days
 1655+ // On the client side (e.g. in the browser cache).
 1656+ 'client' => 30 * 24 * 60 * 60, // 30 days
 1657+ ),
 1658+ 'unversioned' => array(
 1659+ 'server' => 5 * 60, // 5 minutes
 1660+ 'client' => 5 * 60, // 5 minutes
 1661+ ),
 1662+);
16531663
16541664 /**
1655 - * Maximum time in seconds to cache versioned resources served by the resource
1656 - * loader on the server side. This means Squid/Varnish but also any other public
1657 - * proxy cache between the client and MediaWiki.
 1665+ * The default debug mode (on/off) for of ResourceLoader requests. This will still
 1666+ * be overridden when the debug URL parameter is used.
16581667 */
1659 -$wgResourceLoaderVersionedServerMaxage = 30 * 24 * 60 * 60; // 30 days
 1668+$wgResourceLoaderDebug = false;
16601669
16611670 /**
1662 - * Maximum time in seconds to cache unversioned resources served by the resource
1663 - * loader on the client.
1664 - */
1665 -$wgResourceLoaderUnversionedClientMaxage = 5 * 60; // 5 minutes
1666 -
1667 -/**
1668 - * Maximum time in seconds to cache unversioned resources served by the resource
1669 - * loader on the server. This means Squid/Varnish but also any other public
1670 - * proxy cache between the client and MediaWiki.
1671 - */
1672 -$wgResourceLoaderUnversionedServerMaxage = 5 * 60; // 5 minutes
1673 -
1674 -/**
16751671 * Enable data URL embedding (experimental). This variable is very temporary and
16761672 * will be removed once we get this feature stable.
16771673 */
Index: branches/uploadwizard/phase3/includes/EditPage.php
——@@ -2246,7 +2246,7 @@
22472247 }
22482248
22492249 $wgOut->addScript( Html::inlineScript(
2250 - "if ( mediaWiki !== undefined ) { $script }"
 2250+ "if ( window.mediaWiki ) { $script }"
22512251 ) );
22522252
22532253 $toolbar .= "\n</div>";
Property changes on: branches/uploadwizard/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
22542254 Merged /trunk/phase3/includes:r73549-73568
Property changes on: branches/uploadwizard/phase3/FAQ
___________________________________________________________________
Added: svn:mergeinfo
22552255 Merged /branches/new-installer/phase3/FAQ:r43664-66004
22562256 Merged /branches/REL1_15/phase3/FAQ:r51646
22572257 Merged /branches/sqlite/FAQ:r58211-58321
22582258 Merged /trunk/phase3/FAQ:r73549-73568
Property changes on: branches/uploadwizard/phase3/resources
___________________________________________________________________
Added: svn:mergeinfo
22592259 Merged /branches/sqlite/resources:r58211-58321
22602260 Merged /trunk/phase3/resources:r73549-73568
22612261 Merged /branches/new-installer/phase3/resources:r43664-66004
22622262 Merged /branches/REL1_15/phase3/resources:r51646
Property changes on: branches/uploadwizard/phase3
___________________________________________________________________
Modified: svn:mergeinfo
22632263 Merged /trunk/phase3:r73549-73568*
Property changes on: branches/uploadwizard/extensions/ContactPageFundraiser
___________________________________________________________________
Modified: svn:mergeinfo
22642264 Merged /trunk/phase3/extensions/ContactPageFundraiser:r73544-73568
Property changes on: branches/uploadwizard/extensions/XMLRC/generator/README
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: branches/uploadwizard/extensions/XMLRC/generator/rc2udp.ini.sample
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: branches/uploadwizard/extensions/XMLRC/generator/rc2udp.py
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: branches/uploadwizard/extensions/XMLRC/generator
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: branches/uploadwizard/extensions/XMLRC/bridge/udp2xmpp-wikis.ini.sample
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: branches/uploadwizard/extensions/XMLRC/bridge/udp2xmpp.py
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: branches/uploadwizard/extensions/XMLRC/bridge/udp2xmpp.ini.sample
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: branches/uploadwizard/extensions/XMLRC/client/README
___________________________________________________________________
Deleted: svn:mergeinfo
Property changes on: branches/uploadwizard/extensions/Translate/data/plural-gettext.txt
___________________________________________________________________
Deleted: svn:mergeinfo
Index: branches/uploadwizard/extensions/UploadWizard/UploadWizardMessages.php
——@@ -49,8 +49,7 @@
5050 $messagesForJs[ $key ] = wfMsgGetKey( $key, /*DB*/true, $language, /*Transform*/false );
5151 }
5252
53 - $json = new Services_JSON();
54 - $messagesJson = $json->encode( $messagesForJs );
 53+ $messagesJson = FormatJson::encode( $messagesForJs );
5554 return 'mw.addMessages(' . $messagesJson . ');';
5655 }
5756
——@@ -69,5 +68,3 @@
7069 }
7170
7271 }
73 -
74 -?>
Index: branches/uploadwizard/extensions/UploadWizard/SessionStash.php
——@@ -1,4 +1,14 @@
22 <?php
 3+/**
 4+ * SessionStash is intended to accomplish a few things:
 5+ * - enable applications to temporarily stash files without publishing them to the wiki.
 6+ * - Several parts of MediaWiki do this in similar ways: UploadBase, UploadWizard, and FirefoggChunkedExtension
 7+ * the idea is to unify them all here
 8+ * - enable applications to find said files later, as long as the session or temp files haven't been purged.
 9+ * - enable the uploading user (and *ONLY* the uploading user) to access said files, and thumbnails of said files, via a URL.
 10+ * We accomplish this by making the session serve as a URL->file mapping, on the assumption that nobody else can access
 11+ * the session, even the uploading user.
 12+ */
313
414 class SessionStash {
515 // repository that this uses to store temp files
——@@ -7,9 +17,12 @@
818 // array of initialized objects obtained from session (lazily initialized upon getFile())
919 private $files = array();
1020
11 - const SESSION_VERSION = 2;
12 - const SESSION_KEYNAME = 'wsUploadData';
13 - const SESSION_THUMB_KEYNAME = 'wsUploadDataThumb';
 21+ // the base URL for files in the stash
 22+ private $baseUrl;
 23+
 24+ // TODO: Once UploadBase starts using this, switch to use these constants rather than UploadBase::SESSION*
 25+ // const SESSION_VERSION = 2;
 26+ // const SESSION_KEYNAME = 'wsUploadData';
1427
1528 /**
1629 * Represents the session which contain temporarily stored files.
——@@ -27,14 +40,15 @@
2841 throw new MWException( 'session not available' );
2942 }
3043
31 - if ( ! array_key_exists( self::SESSION_KEYNAME, $_SESSION ) ) {
32 - $_SESSION[self::SESSION_KEYNAME] = array();
 44+ if ( ! array_key_exists( UploadBase::SESSION_KEYNAME, $_SESSION ) ) {
 45+ $_SESSION[UploadBase::SESSION_KEYNAME] = array();
3346 }
 47+
 48+ $this->baseUrl = SpecialPage::getTitleFor( 'SessionStash' )->getLocalURL();
3449 }
3550
3651 public function getBaseUrl() {
37 - // XXX do this better
38 - return '/wiki/Special:SessionStash';
 52+ return $this->baseUrl;
3953 }
4054
4155 /**
——@@ -45,9 +59,9 @@
4660 */
4761 public function getFile( $key ) {
4862 if ( !array_key_exists( $key, $this->files ) ) {
49 - $stashData = $_SESSION[self::SESSION_KEYNAME][$key];
 63+ $stashData = $_SESSION[UploadBase::SESSION_KEYNAME][$key];
5064
51 - if ($stashData['version'] !== self::SESSION_VERSION ) {
 65+ if ($stashData['version'] !== UploadBase::SESSION_VERSION ) {
5266 throw new MWException( 'session item schema does not match current software' );
5367 }
5468
——@@ -96,7 +110,7 @@
97111 'mTempPath' => $stashPath,
98112 'mFileSize' => $fileSize,
99113 'mFileProps' => $fileProps,
100 - 'version' => self::SESSION_VERSION
 114+ 'version' => UploadBase::SESSION_VERSION
101115 );
102116
103117 // put extended info into the session (this changes from application to application).
——@@ -107,7 +121,7 @@
108122 }
109123 }
110124
111 - $_SESSION[self::SESSION_KEYNAME][$key] = $stashData;
 125+ $_SESSION[UploadBase::SESSION_KEYNAME][$key] = $stashData;
112126
113127 wfDebug( "SESSION\n=====\n " . print_r( $_SESSION, 1 ) . "\n" );
114128
——@@ -156,6 +170,9 @@
157171 * Find or guess extension -- ensuring that our extension matches our mime type.
158172 * Since these files are constructed from php tempnames they may not start off
159173 * with an extension
 174+ * This does not override getExtension because things like getMimeType already call getExtension,
 175+ * and that results in infinite recursion. So, we preemptively *set* the extension so getExtension can find it.
 176+ * For obvious reasons this should be called as early as possible, as part of initialization
160177 */
161178 public function setExtension() {
162179 // Does this have an extension?
——@@ -179,7 +196,7 @@
180197 throw 'cannot determine extension';
181198 }
182199
183 - return parent::normalizeExtension( $extension );
 200+ $this->extension = parent::normalizeExtension( $extension );
184201 }
185202
186203 /**
——@@ -188,7 +205,7 @@
189206 * buggy code elsewhere that expects a boolean 'suffix'
190207 *
191208 * @param {String|false} name of thumbnail (e.g. "120px-123456.jpg" ), or false to just get the path
192 - * @param {String} path thumbnail should take on filesystem, or containing directory if thumbname is false
 209+ * @return {String} path thumbnail should take on filesystem, or containing directory if thumbname is false
193210 */
194211 public function getThumbPath( $thumbName=false ) {
195212 $path = dirname( $this->path );
——@@ -251,6 +268,7 @@
252269 /**
253270 * Return the URL of the file, if for some reason we wanted to download it
254271 * We tend not to do this for the original file, but we do want thumb icons
 272+ * @return {String} url
255273 */
256274 public function getUrl() {
257275 if ( !isset( $this->url ) ) {
——@@ -268,7 +286,7 @@
269287 public function transform( $params, $flags=0 ) {
270288
271289 // force it to get a thumbnail right away
272 - $flags &= self::RENDER_NOW;
 290+ $flags |= self::RENDER_NOW;
273291
274292 // returns a ThumbnailImage object containing the url and path. Note. NOT A FILE OBJECT.
275293 $thumb = parent::transform( $params, $flags );
——@@ -282,12 +300,10 @@
283301 }
284302
285303 $stashedThumbFile = $this->sessionStash->stashFile( $key, $thumb->path );
286 - $thumb->url = $this->sessionStash->getBaseUrl() . '/' . $key . "." . $stashedThumbFile->extension;
 304+ $thumb->url = $stashedThumbFile->getUrl();
287305
288306 return $thumb;
289307
290308 }
291309
292310 }
293 -
294 -?>
Property changes on: branches/uploadwizard/extensions/LocalisationUpdate
___________________________________________________________________
Modified: svn:mergeinfo
295311 Merged /trunk/phase3/extensions/LocalisationUpdate:r73544-73568
Property changes on: branches/uploadwizard/extensions
___________________________________________________________________
Added: svn:mergeinfo
296312 Merged /trunk/phase3/extensions:r73544-73568

Status & tagging log