------------------------------------------------------------
revno: 995
committer: bassel <[email protected]>
branch nick: aikiframework
timestamp: Thu 2012-01-05 20:48:50 +0200
message:
fixed the call for Plugins class in bootstrap on mac classes are case
sensitive and that was breaking the entire system
modified:
bootstrap.php
libs/Output.php
libs/Plugins.php
libs/aiki.php
libs/database/index.php
libs/database/mysql.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 'bootstrap.php'
--- bootstrap.php 2012-01-05 17:17:40 +0000
+++ bootstrap.php 2012-01-05 18:48:50 +0000
@@ -175,4 +175,4 @@
$aiki->load("image");
$aiki->load("errors");*/
-$aiki->load("plugins");
+$aiki->load("Plugins");
=== modified file 'libs/Output.php'
--- libs/Output.php 2012-01-05 17:17:40 +0000
+++ libs/Output.php 2012-01-05 18:48:50 +0000
@@ -125,7 +125,7 @@
$aiki->site->site_name() . '</title>';
$aiki->Plugins->doAction("output_title", $title);
$encoding = isset($config["db_encoding"]) ? $this->correct_encoding($config["db_encoding"]) : "utf-8";
-
+
$header = sprintf("\n".
"<meta charset='$encoding' >\n" .
"<meta name='generator' content='Aikiframework %s.%s' >\n",
@@ -185,11 +185,10 @@
*/
public function headers() {
global $aiki, $db, $layout, $nogui, $config;
-
+
$header = $this->doctype();
$header .= '<head>';
$header .= $this->title_and_metas();
-
if (!$nogui) {
if (count($layout->widgets_css)) {
@@ -214,7 +213,7 @@
'<link rel="icon" href="' . $config['url'] .
'assets/images/favicon.ico" type="image/x-icon" />';
}
-
+
if (isset($layout->head_output)){
$header .= $layout->head_output;
}
@@ -226,6 +225,7 @@
$bodybegin = "\n<body>\n";
$aiki->Plugins->doAction("output_body_begin", $bodybegin);
$header .= $bodybegin;
+
return $header;
} // end of headers function
=== modified file 'libs/Plugins.php'
--- libs/Plugins.php 2011-11-08 13:42:45 +0000
+++ libs/Plugins.php 2012-01-05 18:48:50 +0000
@@ -47,11 +47,11 @@
function __construct(){
global $aiki, $db;
global $AIKI_ROOT_DIR;
-
+
$this->plugins = array();
$this->actions = array();
$this->must_sorted = array();
-
+
// read active plugins configuration
$site = $aiki->site->get_site();
$view = $aiki->site->view();
@@ -62,10 +62,11 @@
" WHERE plconf_active='active'" .
" ORDER BY plconf_priority";
$configurations = $db->get_results($sql);
+
if (is_null($configurations)) {
return;
}
-
+
// select plugins that match site/view/language
$pluginsActivated = array();
foreach ( $configurations as $configuration ) {
@@ -125,7 +126,7 @@
*/
function doAction($action, &$text) {
-
+
if (!isset($this->actions[$action])) {
return 0;
}
=== modified file 'libs/aiki.php'
--- libs/aiki.php 2011-11-08 13:42:45 +0000
+++ libs/aiki.php 2012-01-05 18:48:50 +0000
@@ -68,9 +68,9 @@
public function load($class) {
global $AIKI_ROOT_DIR;
- if (isset($this->$class))
+ if (isset($this->$class)){
return $this->$class;
-
+ }
// Try to load the class file in /libs, assets/extensions and
// assets/extension/$class/$class.php
if (file_exists($AIKI_ROOT_DIR . '/libs/' . $class . '.php')) {
=== modified file 'libs/database/index.php'
--- libs/database/index.php 2011-11-08 14:04:49 +0000
+++ libs/database/index.php 2012-01-05 18:48:50 +0000
@@ -575,7 +575,7 @@
* @see mysql.php
*/
require_once("mysql.php");
- $db = new ezSQL_mysql( $config['db_user'] , $config['db_pass'] , $config['db_name'] , $config['db_host'] );
+ $db = new ezSQL_mysql( $config['db_user'] , $config['db_pass'] , $config['db_name'] , $config['db_host']);
break;
case "oracle":
=== modified file 'libs/database/mysql.php'
--- libs/database/mysql.php 2012-01-05 17:17:40 +0000
+++ libs/database/mysql.php 2012-01-05 18:48:50 +0000
@@ -91,6 +91,7 @@
public function quick_connect($dbuser='', $dbpassword='', $dbname='', $dbhost='localhost')
{
+
$return_val = false;
if ( ! $this->connect($dbuser, $dbpassword, $dbhost,true) ) ;
else if ( ! $this->select($dbname) ) ;
@@ -132,7 +133,7 @@
$this->dbhost = $dbhost;
$return_val = true;
}
-
+
return $return_val;
}
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
