------------------------------------------------------------
revno: 884
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Thu 2011-07-14 21:40:12 +0200
message:
global replaced by ->errors
modified:
src/bootstrap.php
src/libs/widgets.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 'src/bootstrap.php'
--- src/bootstrap.php 2011-07-13 21:31:56 +0000
+++ src/bootstrap.php 2011-07-14 19:40:12 +0000
@@ -155,13 +155,9 @@
* @global language $language
*/
$languages = $aiki->load("languages");
+
$aiki->load("image");
-
-/**
- * Global error object for use in runtime.
- * @global errors $errors
- */
-$errors = $aiki->load("errors");
+$aiki->load("errors");
/**
* Global object for handling urls.
=== modified file 'src/libs/widgets.php'
--- src/libs/widgets.php 2011-07-13 22:03:17 +0000
+++ src/libs/widgets.php 2011-07-14 19:40:12 +0000
@@ -87,10 +87,9 @@
* @global array $db
* @global aiki $aiki
* @global string $url
- * @global errors $errors
*/
public function CreateLayout(){
- global $db, $aiki, $url, $errors;
+ global $db, $aiki, $url;
// Initialize
$this->widgets_css= array();
@@ -120,7 +119,7 @@
// ..page not found..
if ( !$unique_widget_exists ){
- $this->html_output .= $errors->page_not_found();
+ $this->html_output .= $aiki->errors->page_not_found();
return;
}
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp