------------------------------------------------------------
revno: 1016
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Tue 2012-01-10 23:34:51 +0100
message:
corrected not defined warning of AIKI_REVISION
modified:
libs/Output.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'libs/Output.php'
--- libs/Output.php 2012-01-05 18:48:50 +0000
+++ libs/Output.php 2012-01-10 22:34:51 +0000
@@ -128,8 +128,9 @@
$header = sprintf("\n".
"<meta charset='$encoding' >\n" .
- "<meta name='generator' content='Aikiframework %s.%s' >\n",
- AIKI_VERSION , AIKI_REVISION );
+ "<meta name='generator' content='Aikiframework %s%s' >\n",
+ defined("AIKI_VERSION") ? AIKI_VERSION: "" ,
+ defined("AIKI_REVISION") ? ".". AIKI_REVISION : "" );
$aiki->Plugins->doAction("output_meta", $header);
@@ -189,6 +190,7 @@
$header = $this->doctype();
$header .= '<head>';
$header .= $this->title_and_metas();
+
if (!$nogui) {
if (count($layout->widgets_css)) {
@@ -202,7 +204,7 @@
$header .= sprintf(
'<link rel="stylesheet" type="text/css" ' .
' href="%sstyle.php?site=%s&%swidgets=%s&language=%s" />',
- $config['url'],
+ config("url"),
$aiki->site->get_site(),
( $view ? "view={$view}&" : ""),
implode("_", $layout->widgets_css),
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
