Changeset 737
- Timestamp:
- 10/03/2007 06:03:13 AM (3 years ago)
- Files:
-
- 1 modified
-
trunk/wikka.php (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/wikka.php
r729 r737 1 <?php1 <?php 2 2 /** 3 3 * The Wikka mainscript. … … 80 80 else 81 81 { 82 error_reporting (E_ALL ^ E_NOTICE); // production mode82 error_reporting(E_ALL ^ E_NOTICE); // production mode 83 83 } 84 84 } … … 219 219 reasons: 220 220 1. Like a core path, these represent paths to components that might be 221 shared between installations, so we use the same override mechanism here.221 shared between installations, so we use the same override mechanism here. 222 222 2. While the paths are configurable, the defaults defined here can be overridden 223 <i>before</i> they get to the configuration file (and seen by the installer),224 so they effectively become the defaults used during the installation process.225 This enhances consistency between "sister" installations.223 <i>before</i> they get to the configuration file (and seen by the installer), 224 so they effectively become the defaults used during the installation process. 225 This enhances consistency between "sister" installations. 226 226 3. A (filesystem) file or directory path needs to take the local directory 227 separator into account but in PHP4 a class variable (as used in the default228 configuration file) can only be initialized with a literal or a constant,229 not a concatenation.227 separator into account but in PHP4 a class variable (as used in the default 228 configuration file) can only be initialized with a literal or a constant, 229 not a concatenation. 230 230 */ 231 231 … … 356 356 ? $canon_path 357 357 : DEFAULT_TEMPLATE_PATH 358 ); 358 ); 359 359 /** 360 360 * Effective (configurable) <b>directory</b> for 3rd-party components; these components … … 758 758 $htaccessLocation = str_replace('\\', '/', dirname(__FILE__)).DIRECTORY_SEPARATOR.'.htaccess'; 759 759 #if (file_exists('setup'.DIRECTORY_SEPARATOR.'index.php')) #89 760 if (file_exists(WIKKA_SETUP_PATH.DIRECTORY_SEPARATOR.'index.php')) # 89760 if (file_exists(WIKKA_SETUP_PATH.DIRECTORY_SEPARATOR.'index.php')) # #89 761 761 { 762 762 // run the installer 763 763 #include 'setup'.DIRECTORY_SEPARATOR.'index.php'; #89 764 include WIKKA_SETUP_PATH.DIRECTORY_SEPARATOR.'index.php'; # 89764 include WIKKA_SETUP_PATH.DIRECTORY_SEPARATOR.'index.php'; # #89 765 765 return; // prevent "fall-through" 766 766 } … … 814 814 session_name(md5(BASIC_SESSION_NAME.$wakkaConfig['wiki_suffix'])); 815 815 session_set_cookie_params(0, $wikka_cookie_path); // default path is '/' - we don't want that! this call overrides php.ini settings 816 session_cache_limiter(''); # 279816 session_cache_limiter(''); # #279 817 817 session_start(); 818 818 … … 823 823 * @todo use different name - $wakka clashes with $wakka object (which should be #Wakka) 824 824 */ 825 $wakka_request = $_GET['wakka']; # 312825 $wakka_request = $_GET['wakka']; # #312 826 826 827 827 /** … … 855 855 856 856 //Fix lowercase mod_rewrite bug: URL rewriting makes pagename lowercase. #135 857 if ((strtolower($page) == $page) && (isset($_SERVER['REQUEST_URI']))) # 38857 if ((strtolower($page) == $page) && (isset($_SERVER['REQUEST_URI']))) # #38 858 858 { 859 859 $pattern = preg_quote($page, '/'); … … 956 956 if (isset($_SERVER['HTTP_ACCEPT_ENCODING']) && 957 957 strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && 958 function_exists('gzencode') # 38958 function_exists('gzencode') # #38 959 959 ) 960 960 { … … 974 974 975 975 if (!isset($wakka->do_not_send_anticaching_headers) || 976 (!$wakka->do_not_send_anticaching_headers) # 279976 (!$wakka->do_not_send_anticaching_headers) # #279 977 977 ) 978 978 {