The documentation for $op = 'configure' is incorrect: it says the hook should return a string, although it really should return a form array.

The code example given uses "else if" although the coding standards specify use of "elseif" instead.

CommentFileSizeAuthor
#9 block5.patch1.56 KBfgm
#5 block5.patch2.01 KBfgm
#3 core5.patch2.53 KBfgm
core.php_.patch2.59 KBfgm

Comments

betz’s picture

betz commented
Project: Documentation » Drupal core
Version: » 7.x-dev
Component: Documentation in CVS » documentation

Patch failed to apply. More information can be found at http://testing.drupal.org/node/13895. If you need help with creating patches please look at http://drupal.org/patch/create

fgm’s picture

fgm
Primary language French
Location Paris, France
commented
Version: 7.x-dev » 5.x-dev
StatusFileSize
new core5.patch2.53 KB

No, the error is in the 5.x doc, not 7.x, as indicated by the $Id$ strings in the patch.

Strange thing is it applies cleanly when I apply it manually, but not on testing.d.o. ?

Patch failed to apply. More information can be found at http://testing.drupal.org/node/14048. If you need help with creating patches please look at http://drupal.org/patch/create

fgm’s picture

fgm
Primary language French
Location Paris, France
commented
StatusFileSize
new block5.patch2.01 KB

Yet one more attempt.

Patch failed to apply. More information can be found at http://testing.drupal.org/node/14057. If you need help with creating patches please look at http://drupal.org/patch/create

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
commented
Status: Needs review » Needs work

Yeah, ignore testing bot. He's stupid and doesn't know about docs/developer.

That said, block5.patch is a very strange looking diff and seems to have nothing to do with blocks.

core5.patch looks okay, except I think you are missing a couple "If"s before $op is 'list' and $op is 'configure'.

Feel free to commit this when you fix that.

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
commented

Also double-check to make sure that DRUPAL-6 and HEAD don't need the same fix.

fgm’s picture

fgm
Primary language French
Location Paris, France
commented
Status: Needs work » Needs review
StatusFileSize
new block5.patch1.56 KB

One last (?) attempt.

This specific problem has been fixed in the D6 and D7 docs but they both have a less important problem (list indenting).

However, the source seems to be correct, which makes it look like a bug in the way api.module formats 3-level deep lists when the 2nd-level list contains items after a 3rd-level list. There is no other occurrence of this situation in core.php.

Patch failed to apply. More information can be found at http://testing.drupal.org/node/14102. If you need help with creating patches please look at http://drupal.org/patch/create

fgm’s picture

fgm
Primary language French
Location Paris, France
commented
Status: Needs review » Fixed

Committed. Note sure about the commit message format, though.

Anonymous’s picture

Anonymous (not verified) commented
Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for two weeks with no activity.