offset path is screwy in last svn

george2

just downloaded last night's build, and well my templates died and images broke.

strangely, functions.php and functions-i8n.php
functions.php

line 31 changed to if (@defined(OFFSET_PATH)) {

and functions-i8n.php:

and line 16 changed to
if (@defined(OFFSET_PATH) && OFFSET_PATH === 1) { // for admin only

should all these checks be checking if offset_path is null, and if there aren't any subdirs in the installation path, then something to set the constant to null? that'd be cleaner?

edit: ignore this - admin is broken with these changes...

george2

functions.php line 31 changed to

if (@OFFSET_PATH == 1) {

if offset_path == 1 for admin, and 2 for setup? in that case maybe if (@OFFSET_PATH == 1 || @OFFSET_PATH == 2) ?

george2

also, it would seem that all my markup in the album descriptions have been decoded and is showing up as text. what's changed regarding that?

is it possible to see a list of changes for each nightly build?

acrylian

I don't encounter any problems here and we actually did not change anything after the 6/13 nightly. The last change was done in [1722] by sbillard regarding your thread here: http://www.zenphoto.org/support/topic.php?id=3225&replies=2#post-19319

You can review all changes here http://www.zenphoto.org/trac/browser/trunk or use a svn client with here http://www.zenphoto.org/svn/trunk

If you like file a ticket, but you have to wait until probably thuesday or wednesday until sbillard is back. I am not familar with those parts so I won't touch theme

george2

$desc = htmlspecialchars(getAlbumDesc());
$desc = str_replace("\r\n", "\n", $desc);
$desc = str_replace("\n", '', $desc);

in template-functions.php

i think those three lines should be part of a 'simple text input' / 'advanced input' option.

ie. if simple, then execute those lines, else don't.

ie. if i want to use html code for my description, then i should be able to right!, and if i do:
[p]foo bar foo bar[/p]
[p]more foo bar[/p]

then i wouldn't expect the newline to be replaced with a break return poss. breaking the layout!

so, can we have a 'simple input / expert input' option for description inputs please?

acrylian

Is it possible that you mix a few things in this thread? That has been there for ages and no one ever complained. You can use html there and you even can alsways use `echo getImageDesc()` or `echo getAlbumDesc()` if you don't want the line breaks.

sbillard

OFFSET_PATH has the following values:

0: normal gallery view
>0: admin view
1: admin
2: setup

So, the code in functions.php (in the current nightly builds) is correct.