Changeset 24433

Timestamp:

07/03/08 14:06:19 (6 months ago)

Author:

markwest

Message:

re-worked page identification logic - fixes #35 pageconfigurations.ini not working with directorybased shorturls

Files:

• branches/zikula-1.0/includes/pnTheme.class.php (modified) (1 diff)

branches/zikula-1.0/includes/pnTheme.class.php

@@ -407 +407 @@
                 if (pnConfigGetVar('shorturlstype') == 0) {
                     // remove the base uri, entrypoint, module name and, if it exists, the function name from the string
-                    if (pnConfigGetVar('shorturlsstripentrypoint')) {
-                        $qstring = str_replace(pnGetBaseURI()."/{$this->toplevelmodule}/", '/', $this->requesturi);
-                    } else {
-                        $entrypoint = pnConfigGetVar('entrypoint');
-                        $qstring = str_replace(pnGetBaseURI()."/{$entrypoint}/{$this->toplevelmodule}/", '/', $this->requesturi);
-                    }
-                    $customargs = str_replace("/{$this->func}/", '/', $qstring);
+                    $customargs = str_replace(pnGetBaseURI(), '', $this->requesturi);
+                    $entrypoint = pnConfigGetVar('entrypoint');
+                    $customargs = str_replace("/{$entrypoint}/", '/', $customargs);
                 } else {
                     $extension = pnConfigGetVar('shorturlsext');