SlatePermutate Changeset - 6e11d567188a · protofusion repositories

Changeset - 6e11d567188a

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Nathan Brink (binki) - 14 years ago 2012-02-19 01:21:32
ohnobinki@ohnopublishing.net

Add support for manually specifying the base_uri.

This is necessary for me to continue developing on my messed up mpm_peruser
installation of slate_permutate since my apache's idea of its hostname is
wrong.

2 files changed with 8 insertions and 1 deletions:

inc/class.page.php

inc/config.inc.example

0 comments (0 inline, 0 general)

inc/class.page.php

➞

Show inline comments

@@ @@ -41,6 +41,7 @@ set_include_path(get_include_path() . PA @@
  * sense soon.
  */
 /* defaults */
 $base_uri = '';
 $clean_urls = FALSE;
 $ga_trackers = array();
 $ga_conversions = array();
@@ @@ -697,7 +698,7 @@ class page @@
    */
   public static function uri_resolve($uri = '')
+  {
-    static $base_uri = '';
+    global $base_uri;
     static $host = '';
     if (empty($host))

inc/config.inc.example

➞

Show inline comments

@@ @@ -42,6 +42,12 @@ @@
 /**
  * \brief
  *   Specify the base URI if Slate Permutate's auto-detection doesn't work.
  */
 /* $base_uri = 'http://example.com/slate_permutate/'; */
 /**
  * \brief
  *   Custom clean URLs for schedule sharing. $clean_urls must be enabled.
+ *
  * This string should be set to a valid base URL that is rewritten

0 comments (0 inline, 0 general)