Commit graph

518 commits

Author SHA1 Message Date
IAlex
0cce298226 Merge "fix some spacing" 2013-02-10 12:47:01 +00:00
umherirrender
c598851620 Avoid undefined offset for $wgImageLimits
This can happen, when customized $wgImageLimits, but not
the option in $wgDefaultOptions

Notice:  Undefined offset: 2 in \includes\ImagePage.php on line 364

Change-Id: I1dbcde8782f239279602f509e5987606af8db241
2013-02-10 13:36:25 +01:00
umherirrender
ca31ebad3f fix some spacing
Added/removed spaces after opening/before closing parentheses

Added a space after a comma

Removed unneeded parentheses in condition

Change-Id: I306091347ccaaf11dee0cdfda3019cb0c12be51b
2013-02-09 23:03:53 +01:00
IAlex
fd03fa2825 Merge "Show no size links on image pages with errors" 2013-02-07 11:13:36 +00:00
umherirrender
1044b0b8df fix some spacing
Change-Id: I8f976013f33c5818e4402604fe8610aa3f43b0c6
2013-02-04 20:18:33 +00:00
umherirrender
d1647fe4ac Show no size links on image pages with errors
This avoids useless
"Size of this preview: . Other resolutions:  |  |  | ."
on image pages.

Change-Id: Ieb2787a736ec5ae409ad17dd9919f4975f0b843e
2013-02-02 12:29:49 +01:00
umherirrender
6fbbbd17ca fix some spacing
Change-Id: Ie7bb35871cc99237f3a655f7db22ca1f0646df5e
2013-01-27 14:21:50 +01:00
jenkins-bot
90bf090dd3 Merge "Cleanup to ImagePage::openShowImage()" 2013-01-22 20:00:42 +00:00
raymond
0856c00435 Cleanup HTML of imagepage: avoid empty <ul></ul>
This happens when a redirect without usages exists
While I am in this section: Use modern Html() function

Change-Id: I1af206ab3a83fb0d09773314bb30db01f557ba07
2013-01-15 07:31:27 +00:00
Tim Starling
e0a78d0a33 Introduce $wgEnableCanonicalServerLink
(bug 43466) If enabled, send a rel=canonical link on every page
indicating the correct server to use. I tested all three callers:
Article, ImagePage and the variant feature in getHeadLinksArray().

Change-Id: I59b7c1d5589825ea390967036190218d5ce2db88
2013-01-07 01:04:05 +00:00
Alexandre Emsenhuber
33a5af1d2d Cleanup to ImagePage::openShowImage()
- Removed useless $showLink variable and related check since the variable is always defined to true
- Moved $linktext up so that there's no need to use a temporary variable to modify it
- Moved $longDesc down where it's used
- Change "else { if ( ... ) { } }" to elseif for better clarity

Change-Id: I65dcbb76c7f0a0441a6420e76affe797a3dc9c45
2012-12-20 22:24:54 +00:00
umherirrender
b6f1f03ae0 Set correct context for ImageHistoryPseudoPager
ContextSource::getContext (ImageHistoryPseudoPager): called and $context
is null. Using RequestContext::getMain() for sanity

Change-Id: I0430791a705f42ca3e5d02692070f0fb0dadc897
2012-12-20 19:21:15 +00:00
Reedy
4a5676d997 Leave some FIXME comments for Bug 36911 - Division by zero
Change-Id: I994c482cad1d195cf29d18f7ccf1d8816b1e7330
2012-12-06 23:59:18 +00:00
daniel
b6b686c13b merged master
Change-Id: I0ef7c7f33a5dc5855f38b20c03ddc5306f38ec66
2012-09-19 12:34:10 +02:00
Derk-Jan Hartman
287c78dea8 (bug 39538) SVG filepages do not need the file-nohires message.
Change-Id: I88b75079d09cc3ab1904a0a2d716fe2df57b7be6
2012-09-11 23:48:01 +02:00
daniel
12166f46b4 merged master (2012-09-11)
Change-Id: I8e953eaa22f9d331b0af5e780fbeff6d702b23e3
2012-09-11 11:43:02 +02:00
Aaron
a73d0df62a Revert "(bug 27111) Make cascading foreign repo's fetch description properly"
The combination of $out->addHTML() and the super call cause action=render for
File pages to have the text rendered twice. Wikis get commons descriptions via
action=render, so they were showing the description text twice.

This reverts commit ca13fde652.

Conflicts:

	RELEASE-NOTES-1.20

Change-Id: Ib1072fd1d109c0d6706215ccad1413dd72cb201d
2012-09-05 12:22:14 -07:00
daniel
b6fe213226 merge latest master.
some tests fail due to logical changes, will fix that in a follow-up

Change-Id: I8a5e4087ecf674fbcf6327c5d168cd401be12400
2012-09-05 17:50:13 +02:00
Hashar
89a055491c Merge "'lang' attrib in #mw-content-text should be set to variant code." 2012-09-04 15:04:52 +00:00
Liangent
da43314022 'lang' attrib in #mw-content-text should be set to variant code.
Change-Id: I15cd8c102991c5007b43e06939a0c1a7593d0933
2012-09-04 17:00:27 +02:00
daniel
9994968774 merged master
Change-Id: Ib2b879c4daa17401eeeb50767c0e5a54254855c3
2012-08-29 15:20:15 +02:00
Daniel Kinzler
392af46809 Revert "merged master"
This reverts commit 67bfdc7a68
2012-08-29 13:14:49 +00:00
daniel
67bfdc7a68 merged master
Change-Id: Ib2b879c4daa17401eeeb50767c0e5a54254855c3
2012-08-29 12:06:38 +02:00
Brian Wolff
ca13fde652 (bug 27111) Make cascading foreign repo's fetch description properly
This changes action=render on file pages to include the shared image
description (if it exists). The reasons for this are two fold:

*Logically, most users would consider the shared description part of
  the content of the page, and not part of the site chrome, so it
  should be on action=render
*Foreign file repos use action=render to get image descriptions.
  if you use say en.wikipedia.org as your file repo, commons images
  get cascasively included, but all their descriptions end up
  being the noarticletext message, which is bad. This makes
  the shared image descriptions work.

Some notes on the implementation:
* on action=render the div containing the shared description
  doesn't have the id that the one on normal page view has.
  This is to prevent duplicate ids in the cascading repo scenario.
  I added a class so people can identify them if they want, and this
  allows people to easily identify the "outermost" shared description
  as it would be the only one with the id.
* This doesn't include the "shareddescriptionfollows" message
  (which is disabled by default) that would normally separate the
  local from the non-local description. I wasn't sure, but thought
  that would be considered part of the site chrome.

Patchset 2/3: trailing space/spelling mistake
Patchset 4: rebase

Change-Id: I18bdf29de62526d699740607b5015da4b01fd43d
2012-08-23 15:44:23 -03:00
Siebrand Mazeland
bb17f98644 (bug 39563) Fatal error: Inaccessible function via __call(): msg
Change-Id: I706ce99400edb86740afc5ce8b205030be7f3c68
2012-08-22 20:54:38 +02:00
Alex Monk
d04502b698 (bug 24491) Don't show reupload link if the user can't upload because of protection
Instead, show some text explaining that they cannot upload here.

Also remove a linebreak which someone complained about recently.

Change-Id: I92ab8ad5eebcdd38c0d5d9f7bab7d11e5c844586
2012-08-21 19:06:42 -07:00
Brian Wolff
876128f8c9 (bug 39297) Show a warning if thumbnails won't be animated
This shows a warning on the image description page if the image
is animated, but thumbnails won't be. This includes
gif images that are too big, but also svg images that are animated,
and APNG files.

The message used is file-no-thumb-animation, but will also
check for file-no-thumb-animation-<image extension> so that
admins can do per image type explanations. Gif files have a built-in
explanation that is slightly different (Since its do to resolution).
Ideally one would pass the resolution limit to the gif message,
but I couldn't think of a clean way of doing that. (Also might be
complex to explain to user. They aren't used to resolution as a single
number but as a width x height type thing).

Moves isAnimatedImage from ImageHandler to MediaHandler, so I could
safely use it from any handler class.

Change-Id: I42ee11d889e0c41de53d0951f55a4338ca55311d
2012-08-21 18:31:51 -07:00
Siebrand Mazeland
6fe1f0509b Replace deprecated wfMsg* calls with Message class calls.
Doing this in steps of roughly 100 changes per commit, so that it remains reviewable.

Change-Id: Ib15e670badd3f6aecae8b60e2f9129a31341ce16
2012-08-21 18:38:44 +02:00
daniel
c0b50eb47d merged master
Change-Id: I6afafe971afb3f38fc8f1e66ba409283b8a698f8
2012-08-02 11:01:22 +02:00
Derk-Jan Hartman
8fa160aadb bug 36073 Use mw-imagepage-linkstoimage-ns as a class instead of an ID
This avoids multiple defines of the same ID on a File page.

Change-Id: I0f8ae37d74f2ec519361b2af164e115f6efa4ac6
2012-08-01 21:34:34 +02:00
Siebrand
7ab935b039 Merge "Use local context to get messages and time formatting methods of Language class." 2012-07-29 20:46:40 +00:00
daniel
d87135d706 merged master
Change-Id: Iad12ee382d6aeb1fab6fefb611d290b74865ea4b
2012-07-23 22:07:18 +02:00
Siebrand
e516a54238 Merge "'lang' attrib in #mw-imagepage-content should use ->getHtmlCode()" 2012-07-13 20:36:30 +00:00
Alexandre Emsenhuber
65a0b35bd4 Use local context to get messages and time formatting methods of Language class.
Only updated the code in the ImageHistoryList class.

Change-Id: I75bbbcb5c93f3c35c347ec8a0156cbb4b7c10142
2012-07-11 22:54:43 +02:00
Alexandre Emsenhuber
905d83e3ad Use Linker::linkKnown() instead of Linker::link() with options at the end in ImagePage.php
Change-Id: I15848983bb675aac4cd017ab7712f884b928d708
2012-07-11 09:18:07 +02:00
Tim Starling
072416fa2d Fix indenting errors introduced in Wikidata branch
Change-Id: I487a0966a26359d4a6769331a6e2ee356eeb41db
2012-06-19 19:45:31 +10:00
daniel
a830943203 Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into Wikidata 2012-06-14 12:43:43 +02:00
daniel
1116aa4f62 fix broken global reference 2012-06-12 11:11:37 +02:00
Liangent
e7ddfcf22e replace whitespace with 'word-separator' message
Change-Id: I34e099af74196579f20685e45d81b00ed8f76461
2012-06-11 19:59:45 +02:00
jeroendedauw
a7e28d2011 merged master
Change-Id: I4cf7b0f87cd571a6b50f66995dd9ad987a6ecdf8
2012-06-06 16:44:15 +02:00
awjrichards
c29fd59775 Big oops - merged to wrong branch.
Revert "Revert to arbitrarily old point before initial remote branch creation to help clean up"

This reverts commit ee0d3d330f
2012-06-05 22:58:54 +00:00
Liangent
4181ceb9f3 'lang' attrib in #mw-imagepage-content should use ->getHtmlCode()
Change-Id: If960182af9324307e509ad3bdd31a68844f121b5
2012-06-03 02:46:21 +08:00
awjrichards
ee0d3d330f Revert to arbitrarily old point before initial remote branch creation to help clean up
Change-Id: I41a3d1e55d3ea9dffa42451237fe065f9334361d
2012-06-02 08:43:04 -07:00
Demon
1dc986a90f Merge "[FileRepo] Made getDescription() respect *_deleted fields." 2012-06-04 20:41:52 +00:00
Alexandre Emsenhuber
42fcb726e6 Fix user rights check to display the "revert" link on file histories.
* Don't do expensive checks for display (for the consistency of the interface)
* Removed the logged-in check and changed it for 'upload' right (as the user need this right to execute the action)

Change-Id: Ie5752e5292a953cbcf81ab665365c3efbd4eba6a
2012-05-29 19:09:01 +02:00
daniel
250da851d1 merged master 2012-05-29 17:01:13 +02:00
Liangent
22b00ec69d (bug 37186) Remove hard coded parentheses in ImagePage.php
Change-Id: Ib516e501953f37a69707a5de3e2ed96004760caa
2012-05-29 16:10:47 +08:00
Aaron
9f6afeab0d [FileRepo] Made getDescription() respect *_deleted fields.
Change-Id: I1dd54611501d6747fb4ad6cbe6b58b0010b1d6d4
2012-05-25 16:00:49 -07:00
Aaron Schulz
1aaac4c915 Avoid extreme performance regression in ImagePage.
* For some reason, when 404 handling is off, all the links for
  $wgImageLimits were still generated but not put into the HTML.
  They still triggered convert() calls - 7 times by default.

Change-Id: I0d12c7ec3c02039c1307a1a1d04d1d1cbd44b547
2012-05-19 22:07:15 -07:00
Aaron
86e2372772 Fixed call to setArticleBodyOnly() on wrong object type.
Change-Id: I492bbdb41aa849a86b162c7cc659dde391874454
2012-05-16 11:15:00 -07:00