Browse files

Merge pull request #1 from vimishor/master

Updated to latest version
  • Loading branch information...
2 parents 6fd6b9e + 54cd47f commit c675fef7703e144c9e4050665b6b0c54df660e75 @danmcp danmcp committed Jun 18, 2012
Showing with 7 additions and 6 deletions.
  1. +4 −3 .openshift/action_hooks/deploy
  2. +1 −1 php/VERSION
  3. +1 −1 php/doku.php
  4. +1 −1 php/inc/html.php
View
7 .openshift/action_hooks/deploy
@@ -14,12 +14,13 @@ if [ ! -d "$OPENSHIFT_DATA_DIR/pages" ];
then
# move directory content
mv $OPENSHIFT_REPO_DIR/php/data/* $OPENSHIFT_DATA_DIR/
+ mv $OPENSHIFT_REPO_DIR/php/data/.??* $OPENSHIFT_DATA_DIR/
# remove directory
rm -rf $OPENSHIFT_REPO_DIR/php/data
- # create link
- ln -sf $OPENSHIFT_DATA_DIR/ $OPENSHIFT_REPO_DIR/php/data
+ # create link (optional)
+ #ln -sf $OPENSHIFT_DATA_DIR/ $OPENSHIFT_REPO_DIR/php/data
echo
echo "done."
@@ -30,4 +31,4 @@ then
echo "=================================================="
else
echo "This is not a fresh installation, skipping build"
-fi
+fi
View
2 php/VERSION
@@ -1 +1 @@
-2012-01-25 "Angua"
+2012-01-25a "Angua"
View
2 php/doku.php
@@ -7,7 +7,7 @@
*/
// update message version
-$updateVersion = 36;
+$updateVersion = 36.1;
// xdebug_start_profiling();
View
2 php/inc/html.php
@@ -1437,7 +1437,7 @@ function html_edit_form($param) {
global $TEXT;
if ($param['target'] !== 'section') {
- msg('No editor for edit target ' . $param['target'] . ' found.', -1);
+ msg('No editor for edit target ' . hsc($param['target']) . ' found.', -1);
}
$attr = array('tabindex'=>'1');

0 comments on commit c675fef

Please sign in to comment.