------------------------------------------------------------
revno: 1155
committer: Jakub Jankiewicz <[email protected]>
branch nick: aikiframework
timestamp: Tue 2012-04-03 08:57:14 +0200
message:
Fix no result error no show up (#797018)
modified:
bootstrap.php
index.php
libs/AikiScript.php
libs/Engine_aiki.php
libs/image.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-03-06 19:35:19 +0000
+++ bootstrap.php 2012-04-03 06:57:14 +0000
@@ -28,6 +28,9 @@
* @TODO: Need to integrat the bzr revno into this after the X.X.X.REVNO
* since bassel nuked it because he didn't understand it.
*/
+$_SERVER["SERVER_PORT"] = 80;
+
+
define('AIKI_VERSION','0.9.0.1');
/**
=== modified file 'index.php'
--- index.php 2012-03-12 05:54:54 +0000
+++ index.php 2012-04-03 06:57:14 +0000
@@ -16,7 +16,16 @@
* @package Aiki
* @filesource
*/
-
+if (get_magic_quotes_gpc()) {
+ function stripslashes_gpc(&$value)
+ {
+ $value = stripslashes($value);
+ }
+ array_walk_recursive($_GET, 'stripslashes_gpc');
+ array_walk_recursive($_POST, 'stripslashes_gpc');
+ array_walk_recursive($_COOKIE, 'stripslashes_gpc');
+ array_walk_recursive($_REQUEST, 'stripslashes_gpc');
+}
/**
* Starts the clock so we can measure loading time of the site
=== modified file 'libs/AikiScript.php'
--- libs/AikiScript.php 2012-02-13 21:24:24 +0000
+++ libs/AikiScript.php 2012-04-03 06:57:14 +0000
@@ -84,7 +84,7 @@
$rest = preg_replace('/;$/', "", trim(substr($php_function, $len+1)));
$rest = preg_replace('/\)$/', "", $rest);
-
+
//evaluate each case..
switch ($word) {
case "":
@@ -134,14 +134,14 @@
$php_output = htmlspecialchars($temp);
break;
- case '$aiki':
- if (preg_match('/\$aiki\-\>(.*)\-\>(.*)\((.*)\)\;?/Us',
+ case '$aiki':
+ if (preg_match('/\$aiki\-\>(.*)\-\>(.*)\(([^\)]*)\)\;?/Us',
$php_function, $partial)) {
$php_output = $this->aiki_function($partial[1],
$partial[2], $partial[3]);
}
break;
- case "sql":
+ case "sql":
$php_output= $this->sql($rest);
break;
case "sql_rows":
@@ -235,7 +235,6 @@
if ($state==0 && count($result)>0) {
$result[] ="";
}
-
return $result;
} // end of mtoken function
=== modified file 'libs/Engine_aiki.php'
--- libs/Engine_aiki.php 2012-03-08 22:08:18 +0000
+++ libs/Engine_aiki.php 2012-04-03 06:57:14 +0000
@@ -306,6 +306,9 @@
break;
}
}
+ if (!$widget_select) {
+ return false;
+ }
if ($records_num !== false) {
$widget->widget = str_replace("[records_num]",
=== modified file 'libs/image.php'
--- libs/image.php 2012-03-15 12:31:15 +0000
+++ libs/image.php 2012-04-03 06:57:14 +0000
@@ -22,7 +22,6 @@
}
-
/**
* A utility class to manipulate images.
*
@@ -67,8 +66,7 @@
exec("rsvg --width $newwidth --height $newheight " .
"$file $filenamepng", $output);
- $output = implode("\n", $output);
-
+
} else {
/**
* @todo rip out this error, a user should never seen this.
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
