------------------------------------------------------------
revno: 940
committer: Jakub Jankiewicz <[email protected]>
branch nick: aikiframework
timestamp: Thu 2011-11-17 17:39:35 +0100
message:
Add run_sql.php to Makefile.am
modified:
src/assets/apps/admin/Makefile.am
src/index.php
src/libs/dictionary.php
src/libs/input.php
src/libs/site.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/assets/apps/admin/Makefile.am'
--- src/assets/apps/admin/Makefile.am 2011-11-08 13:42:45 +0000
+++ src/assets/apps/admin/Makefile.am 2011-11-17 16:39:35 +0000
@@ -24,6 +24,7 @@
control_panel.js \
database_forms.php \
events.php \
+ run_sql.php \
urls_widgets.php \
log_view.php
=== modified file 'src/index.php'
--- src/index.php 2011-11-08 13:42:45 +0000
+++ src/index.php 2011-11-17 16:39:35 +0000
@@ -60,7 +60,7 @@
$nogui = true;
}
-$log->message("<>test ERROR", Log::ERROR);
+
/**
* @todo fix the misspelling
*/
=== modified file 'src/libs/dictionary.php'
--- src/libs/dictionary.php 2011-11-11 20:22:06 +0000
+++ src/libs/dictionary.php 2011-11-17 16:39:35 +0000
@@ -112,7 +112,6 @@
return $ret;
}
-
/**
* translate a term
*
@@ -123,8 +122,7 @@
* @return string term translated
*
*/
-
- function translate( $term, $translateFrom=NULL, $translateTo=NULL, $domain=NULL){
+ function translate($term, $translateFrom=NULL, $translateTo=NULL, $domain=NULL) {
$to = is_null($translateTo) ? $this->translateTo : $translateTo;
$from = is_null($translateFrom)? $this->translateFrom : $translateFrom;
@@ -153,7 +151,7 @@
*
*/
-function __($term, $domain=NULL){
+function __($term, $domain=NULL) {
global $aiki;
$to = $aiki->site->language();
if ( $to == "en" ) {
=== modified file 'src/libs/input.php'
--- src/libs/input.php 2011-11-08 13:42:45 +0000
+++ src/libs/input.php 2011-11-17 16:39:35 +0000
@@ -38,7 +38,7 @@
/**
* Handle input
*
- * @global aiki $aiki global aiki instance
+ * @global aiki $aiki global aiki instance
* @global CreateLayout $layout global layout instance
*/
public function input() {
@@ -94,8 +94,8 @@
/**
* A form handler
*
- * @param string $type type of form handler
- * @param array $post post data
+ * @param string $type type of form handler
+ * @param array $post post data
* @global membership $membership global membership instance
*
* @todo this function does not look complete, need to investigate
=== modified file 'src/libs/site.php'
--- src/libs/site.php 2011-11-12 21:32:52 +0000
+++ src/libs/site.php 2011-11-17 16:39:35 +0000
@@ -151,12 +151,12 @@
$this->site_prefix = "";
$path = $aiki->url->first_url();
if ( $path != "homepage" ) {
- $site= $db->get_var("SELECT site_shortcut from aiki_sites where site_prefix='$path'");
- if ($site){
- $config['site'] = $site;
- $aiki->url->shift_url();
- $this->site_prefix = $path;
- }
+ $site= $db->get_var("SELECT site_shortcut from aiki_sites where site_prefix='$path'");
+ if ($site){
+ $config['site'] = $site;
+ $aiki->url->shift_url();
+ $this->site_prefix = $path;
+ }
}
}
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
