Serendipity Forums

Posted: **Thu May 24, 2007 1:39 pm**

Hi!

Can you please provided a (unified) diff for the required patches against current versions of the patched files? Thanks!

Regards,
Garvin

Posted: **Fri May 25, 2007 1:43 am**

a patch to what version of my suggestions?

the version with the single occurrence of the $renameValues + hook-call?

And, where should this code be inserted?

and all these code - which works only with mysql(i) - is behind the mysql-test. Or, if you think, that the hook should be called even if there is not mysql(i), - perhaps some further plugin would use it for something independant from mysql(i) - we can move the new code directly before the
Code: Select all
    // Only MySQL supported, since I don't know how to use REGEXPs differently.
But in this case we have to add these mysql(i)-test in the staticpage-php, because this special code needs mysql(i).

and what is about the structure? Is this

Code: Select all

if ($type == 'dir') {do something 

} elseif ($type == 'file') {do something 

} elseif ($type == 'filedir') {do something }

ok?

Posted: **Fri May 25, 2007 1:05 pm**

Hi!

stm999999999 wrote:a patch to what version of my suggestions?

Preferably to the one that works best for you - the single $renameValues call, I think. I'm willing to modify the core for that, so that's fine!

The mysqli-check should be added to the staticpage plugin itself, yes.

Thanks alot,
Garvin

Posted: **Tue May 29, 2007 10:44 pm**

I will do it in the next days.

Posted: **Wed Jun 13, 2007 11:25 pm**

garvinhicking wrote: The mysqli-check should be added to the staticpage plugin itself, yes.

would this be the right mysqli-check? with "break" instead of "return true"?

Code: Select all

                
case 'backend_sidebar_entries_event_display_staticpages':
                    $this->showBackend();
                    break;

                
case 'backend_media_rename':
                    
// Only MySQL supported, since I don't know how to use REGEXPs differently.
                    
if ($serendipity['dbType'] != 'mysql' && $serendipity['dbType'] != 'mysqli') {
                        break;
                    }

staticpage-media-rename-code ...

break;

case 'external_plugin':

Posted: **Thu Jun 14, 2007 11:21 am**

Hi!

Yes, that would do!

Regards,
Garvin

Posted: **Fri Jun 15, 2007 12:52 am**

so, now:

http://nopaste.linux-dev.org/?1562

http://nopaste.linux-dev.org/?1563

both diffs are for the latest file-versions on the svn-servers

perhaps the file-headers must be corrected by you.

Posted: **Fri Jun 15, 2007 10:42 am**

Hi!

The second patch doesn't apply here on my linux system, could you try to create a unified diff without that extra CSDiff output you have in that file?

Alternatively, paste the whole functions_images.inc.php file and SVN will take care of the DIFFing for me.

Regards,
Garvin

Posted: **Fri Jun 15, 2007 3:13 pm**

garvinhicking wrote:Hi!

The second patch doesn't apply here on my linux system, could you try to create a unified diff without that extra CSDiff output you have in that file?

What do you mean with "extra CSDiff output"? This?

Code: Select all

File difference report generated by CSDiff by ComponentSoftware on 14.06.2007 23:11 

Base file: \Alt\functions_images.inc.php 
Compared file: \neu\functions_images.inc.php

if yes: it is a problem for you simply to delete this in the diff-file?

if not: what extra output do you mean?

And BTW, why do the first patch works?

Posted: **Fri Jun 15, 2007 3:27 pm**

Hi!

What do you mean with "extra CSDiff output"? This?

Exactly.

if yes: it is a problem for you simply to delete this in the diff-file?

I tried. Then it doesn't work at all applying the diff with "patch functions_images.inc.php < yourpatch.diff".

And BTW, why do the first patch works?

I applied it manually and did not use your file. That's too much work for the other diff, though.

Regards,
Garvin

Posted: **Fri Jun 15, 2007 7:21 pm**

hm, did you tried it with the option for ed-style-diffs?

Code: Select all

patch -e xxxxxx

Code: Select all

         Upon startup, patch attempts to determine the type of the
          diff listing, unless overruled by a -c (--context), -e
          (--ed), -n (--normal), or -u (--unified) option.  Context

Posted: **Sun Jun 17, 2007 1:34 pm**

Hi!

Same problem:

patch unexpectedly ends in middle of line
patch: **** Only garbage was found in the patch input.

Regards,
Garvin

Posted: **Sun Jun 17, 2007 1:52 pm**

OK, I will try another diff-tool.

BTW, why did you not adopt the code-comment in the first patch?

Code: Select all

// Only MySQL supported, since I don't know how to use REGEXPs differently.

1) comments in code are helpfull vor further developers, or?

2) this is in your functions_images.inc.php, too

Posted: **Sun Jun 17, 2007 2:03 pm**

Hi!

BTW, why did you not adopt the code-comment in the first patch?

Because I applied it manually and thought the comment was not really useful

. But I can add it tomorrow, you are right.

Regards,
Garvin

Posted: **Sun Jun 17, 2007 2:32 pm**

ok, I tried another diff-tool on windows:

http://nopaste.linux-dev.org/?1575

this patch is still a patch to the unchanged file-version. Give it a try - if it not work I have to use the non-GUI-diffutils.

and please, try it with and without -e.

Serendipity Forums

change of image folder has no effect to static pages