This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  fc64f4230f1217d59ef59d431aa849175cc04280 (commit)
      from  138deb70be83bccb0cbd6ae831d0e2170bc14044 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fc64f4230f1217d59ef59d431aa849175cc04280
Author: Roland Mas <[email protected]>
Date:   Fri Jun 12 12:34:32 2015 +0200

    Cope with local themes where the class may still be called "Theme"

diff --git a/src/common/include/pre.php b/src/common/include/pre.php
index b6a4672..adbc975 100644
--- a/src/common/include/pre.php
+++ b/src/common/include/pre.php
@@ -302,6 +302,9 @@ if (getenv('FUSIONFORGE_NO_DB') != 'true' and 
forge_get_config('database_name')
                        $y[] = ucfirst($i);
                }
                $classname = implode('_', $y);
+               if (!class_exists($classname)) {
+                       $classname = 'Theme'; // Cope with local themes where 
the class may still be called "Theme"
+               }
                $HTML = new $classname () ;
                $HTML->_theme = $x_theme;
                unset($x_theme);

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/pre.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/common/include/pre.php b/src/common/include/pre.php
index b6a4672..adbc975 100644
--- a/src/common/include/pre.php
+++ b/src/common/include/pre.php
@@ -302,6 +302,9 @@ if (getenv('FUSIONFORGE_NO_DB') != 'true' and 
forge_get_config('database_name')
                        $y[] = ucfirst($i);
                }
                $classname = implode('_', $y);
+               if (!class_exists($classname)) {
+                       $classname = 'Theme'; // Cope with local themes where 
the class may still be called "Theme"
+               }
                $HTML = new $classname () ;
                $HTML->_theme = $x_theme;
                unset($x_theme);


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits

Reply via email to