Port Inline to 6.x

misty3 - November 20, 2007 - 00:40
Project:Inline
Version:6.x-1.x-dev
Component:Code
Category:feature request
Priority:normal
Assigned:sun
Status:closed
Description

Inline is very useful module. Updating HEAD for Drupal 6x beta
will be very appreciated.

#1

sun - November 20, 2007 - 00:58
Title:Update INline for Drupal6x» Port Inline to 6.x

Agreed. Who wants to take up the ball?

#2

sun - February 13, 2008 - 15:42
Category:feature request» task

This task depends on Inline API to be ready.

#3

SiliconMind - April 27, 2008 - 21:37

Here is quick (and dirty) patch for inline-5.x-1.1 to make it work with drupal 6.x
add new file inline.theme.inc and apply attached patch.
you'll also need ImageCache patched for drupal 6.x, so check this thread: http://drupal.org/node/232624

AttachmentSize
inline.patch7.53 KB
inline.theme_.inc_.gz551 bytes

#4

Eaton - June 20, 2008 - 20:34
Status:active» patch (code needs review)

Here's a version of the patch that removes the notices, and includes the theme.inc file without requiring a separate download.

#5

Eaton - June 20, 2008 - 20:35
Version:6.x-1.x-dev» 5.x-1.1

Hmmmm. On the other hand, attaching the patch file doesn't seem to work. Oh, well.

#6

Eaton - June 20, 2008 - 22:33

That's more like it.

AttachmentSize
drupal-6--1.patch13.06 KB

#7

sun - June 21, 2008 - 16:04
Status:patch (code needs review)» patch (code needs work)

- AFAIK, menu item descriptions should not be t()'d
- Why is that change?

function inline_nodeapi(&$node, $op, $arg) {
-  if (!is_array($node->files)) {
+  if (empty($node->files) || !is_array($node->files)) {

- This also looks like a logical change to me - why?
-          $node->teaser = _inline_substitute_tags($node, 'teaser');
-          $node->body = _inline_substitute_tags($node, 'body');
+          if (!empty($node->teaser)) {
+            $node->teaser = _inline_substitute_tags($node, 'teaser');
+          }
+          if (!empty($node->body)) {
+            $node->body = _inline_substitute_tags($node, 'body');
+          }

- CVS Id tag is missing on first line in inline.theme.inc

Other than that, the patch looks good. However, it would be nice if those coding-style changes could be avoided (leaving code clean-up to another patch against both D5 and D6 afterwards).

#8

Eaton - June 21, 2008 - 21:08

Both of the changes you noted were causing notices to be thrown when nodes were loaded -- uninitialized variables being referenced, etc. Apologies for the whitespace -- my editor was set to automatically strip trailing spaces and that showed up in the patch without my realizing it. I'll roll a new version without that. :)

#9

sun - June 22, 2008 - 14:25

Let's deal with all coding style and E^ALL fixes in #273489: Code clean-up, thus limiting this patch to required changes for D6 only.

#10

sun - July 14, 2008 - 11:33

#282173: Drupal 6 port has been marked as duplicate of this issue; contains a patch, too.

#11

Eaton - July 27, 2008 - 15:32

Re-rolled version of the patch without the E_ALL fixes or whitespace corrections. Hopefully it will be committed at some point.

AttachmentSize
inline.patch9.36 KB

#12

sun - July 30, 2008 - 20:04
Version:5.x-1.1» 6.x-1.x-dev
Category:task» feature request

Well, I think we're close...

- Menu item description still contains t().
- inline.theme.inc misses a CVS Id comment on second line of the file.

Also, when trying to apply this patch:

6 out of 8 hunks FAILED

#13

Eaton - July 30, 2008 - 21:11

Just an FYI that I'll be using the earlier version with the E_ALL fixes on my own blog; others are welcome to continue the porting work.

#14

sun - August 8, 2008 - 21:53
Assigned to:Anonymous» sun
Status:patch (code needs work)» patch (code needs review)

ah, well... it seems that all of you are working with an extremely out-dated version of Inline (> 1 year). That explains, why all posted patches do not apply at all.

Please test attached patch - which should apply cleanly against the latest development snapshot.

AttachmentSize
inline.d6-port.patch10.12 KB

#15

koorneef - August 15, 2008 - 23:13

Tried the patch on: inline-5.x-1.x-dev.tar.gz
Patch applied except for the .info file, manually editted this file.
Could enable the module, but when trying to administer module got a PHP error:
Failed opening required 'sites/all/modules/inline/system.admin.inc'

Inline shows up in inputfilter admin pages.

No further testing done.

#16

sun - August 17, 2008 - 13:02

Hm. I do not think that this error is related to Inline module and this patch, because there is no reference to system.admin.inc in this patch.

#17

sun - August 17, 2008 - 14:23
Status:patch (code needs review)» fixed

Committed attached patch.

AttachmentSize
inline.d6-port.patch9.85 KB

#18

Anonymous (not verified) - August 31, 2008 - 14:32
Status:fixed» closed

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

 
 

Drupal is a registered trademark of Dries Buytaert.