Merge in some minor fixes from stable
authorDan
Fri, 09 Nov 2007 11:18:54 -0500
changeset 248 ed13b72b13cc
parent 247 e876c75a9149 (current diff)
parent 246 c9fd175289aa (diff)
child 249 f4323fa79313
Merge in some minor fixes from stable
includes/sessions.php
includes/template.php
index.php
install.php
--- a/includes/sessions.php	Fri Nov 09 11:15:06 2007 -0500
+++ b/includes/sessions.php	Fri Nov 09 11:18:54 2007 -0500
@@ -206,8 +206,8 @@
   var $acl_deps = Array();
   
   /**
-   * Our tell-all list of permissions.
-   * @access private - or, preferably, protected
+   * Our tell-all list of permissions. Do not even try to change this.
+   * @access private
    * @var array
    */
    
@@ -2803,8 +2803,8 @@
   var $acl_deps = Array();
   
   /**
-   * Our tell-all list of permissions.
-   * @access private - or, preferably, protected...too bad this has to be PHP4 compatible
+   * Our tell-all list of permissions. Do not even try to change this.
+   * @access private
    * @var array
    */
    
--- a/index.php	Fri Nov 09 11:15:06 2007 -0500
+++ b/index.php	Fri Nov 09 11:18:54 2007 -0500
@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
  * Version 1.0.2 (Coblynau)
  * Copyright (C) 2006-2007 Dan Fuhry
@@ -11,8 +11,11 @@
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
  *
+ * @package Enano
+ * @subpackage Frontend
+ *
  */
-
+ 
   // Set up gzip encoding before any output is sent
   
   $aggressive_optimize_html = false;